Delete world if an exception was thrown

AlpsBTE · Sep 23, 2021 · ea6ea65 · ea6ea65
1 parent 689afc8
commit ea6ea65
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/com/alpsbte/plotsystem/core/system/plot/generator/AbstractPlotGenerator.java b/src/main/java/com/alpsbte/plotsystem/core/system/plot/generator/AbstractPlotGenerator.java
@@ -76,7 +76,10 @@ public AbstractPlotGenerator(@NotNull Plot plot, @NotNull Builder builder) {
             } catch (InterruptedException | ExecutionException ex) { plotGen.completeExceptionally(ex); }
         })).whenComplete((t, exception) -> {
             try {
-                if (exception != null) onException(exception);
+                if (exception != null) {
+                    onException(exception);
+                    if (worldManager.isMVWorld(plot.getPlotWorld())) worldManager.deleteWorld(plot.getWorldName(), true, true);
+                }
                 this.onComplete(exception != null);
             } catch (SQLException ex) { PlotHandler.abandonPlot(plot); onException(ex); }
         });
@@ -103,9 +106,8 @@ protected CompletableFuture<Boolean> configureWorldGeneration() {
     protected CompletableFuture<Boolean> generateWorld() {
         // Check if world creator is configured and add new world to multiverse world manager
         if (worldCreator != null) {
-            if (!worldManager.isMVWorld(plot.getPlotWorld())) {
-                worldManager.addWorld(plot.getWorldName(), worldCreator.environment(), null, worldCreator.type(), false, "VoidGen");
-            }
+            if (worldManager.isMVWorld(plot.getPlotWorld())) worldManager.deleteWorld(plot.getWorldName(), true, true);
+            worldManager.addWorld(plot.getWorldName(), worldCreator.environment(), null, worldCreator.type(), false, "VoidGen");
         } else {
             Bukkit.getLogger().log(Level.SEVERE, "World Creator is not configured!");
             return CompletableFuture.completedFuture(false);