Fix EditSession initialisation without a World

EngineHub · Nov 4, 2023 · 19e8e80 · 19e8e80
1 parent 98d396f
commit 19e8e80
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
@@ -303,7 +303,7 @@ public String getDisplayName() {
             this.bypassNone = extent;
         }
 
-        setReorderMode(this.reorderMode);
+        setReorderMode(ReorderMode.MULTI_STAGE);
     }
 
     private Extent traceIfNeeded(Extent input) {
@@ -372,6 +372,10 @@ public void enableStandardMode() {
      */
     @Deprecated
     public void setReorderMode(ReorderMode reorderMode) {
+        if (world == null && reorderMode == ReorderMode.FAST) {
+            // Fast requires a world, for now we can fallback to multi stage, but use "none" in the future.
+            reorderMode = ReorderMode.MULTI_STAGE;
+        }
         if (reorderMode == ReorderMode.FAST && sideEffectExtent == null) {
             throw new IllegalArgumentException("An EditSession without a fast mode tried to use it for reordering!");
         }