schematic: fix double-callback after rotate

DenizenScript · Apr 16, 2022 · 450f60a · 450f60a
1 parent 45616a4
commit 450f60a
Showing 1 changed file with 24 additions and 20 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SchematicCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SchematicCommand.java
@@ -188,34 +188,38 @@ else if (!scriptEntry.hasObject("area")
 
     public static void rotateSchem(CuboidBlockSet schematic, int angle, boolean delayed, Runnable callback) {
         Runnable rotateRunnable = () -> {
-            int ang = angle;
-            while (ang < 0) {
-                ang = 360 + ang;
-            }
-            while (ang >= 360) {
-                ang -= 360;
+            try {
+                int ang = angle;
+                while (ang < 0) {
+                    ang = 360 + ang;
+                }
+                while (ang >= 360) {
+                    ang -= 360;
+                }
+                if (ang != 0) {
+                    ang = 360 - ang;
+                    while (ang > 0) {
+                        ang -= 90;
+                        schematic.rotateOne();
+                    }
+                }
             }
-            if (ang != 0) {
-                ang = 360 - ang;
-                while (ang > 0) {
-                    ang -= 90;
-                    schematic.rotateOne();
+            finally {
+                if (callback != null) {
+                    if (delayed) {
+                        Bukkit.getScheduler().runTask(Denizen.getInstance(), callback);
+                    }
+                    else {
+                        callback.run();
+                    }
                 }
             }
-            Bukkit.getScheduler().runTask(Denizen.getInstance(), callback);
         };
         if (delayed) {
             Bukkit.getScheduler().runTaskAsynchronously(Denizen.getInstance(), rotateRunnable);
         }
         else {
-            try {
-                rotateRunnable.run();
-            }
-            finally {
-                if (callback != null) {
-                    callback.run();
-                }
-            }
+            rotateRunnable.run();
         }
     }