From 618cbd2250e89a233e6f7663ef09f812cd766403 Mon Sep 17 00:00:00 2001
From: Matthew Miller <mnmiller1@me.com>
Date: Tue, 4 Dec 2018 20:24:50 +1000
Subject: [PATCH] Few small fixes

---
 .../src/main/java/com/sk89q/worldedit/EditSession.java    | 8 +++++---
 .../worldedit/extent/reorder/ChunkBatchingExtent.java     | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
index 31bc0bd07..354121c8d 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
@@ -271,10 +271,10 @@ public class EditSession implements Extent, AutoCloseable {
 
     // pkg private for TracedEditSession only, may later become public API
     boolean commitRequired() {
-        if (reorderExtent.commitRequired()) {
+        if (reorderExtent != null && reorderExtent.commitRequired()) {
             return true;
         }
-        if (isBatchingChunks() && chunkBatchingExtent.commitRequired()) {
+        if (chunkBatchingExtent != null && chunkBatchingExtent.commitRequired()) {
             return true;
         }
         if (fastModeExtent != null && fastModeExtent.commitRequired()) {
@@ -294,7 +294,7 @@ public class EditSession implements Extent, AutoCloseable {
     }
 
     /**
-     * Sets the {@link ReorderMode} of this EditSession.
+     * Sets the {@link ReorderMode} of this EditSession, and flushes the session.
      *
      * @param reorderMode The reorder mode
      */
@@ -305,6 +305,8 @@ public class EditSession implements Extent, AutoCloseable {
         if (reorderMode == ReorderMode.MULTI_STAGE && reorderExtent == null) {
             throw new IllegalArgumentException("An EditSession without a reorder extent tried to use it for reordering!");
         }
+        flushSession();
+
         this.reorderMode = reorderMode;
         switch (reorderMode) {
             case MULTI_STAGE:
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/ChunkBatchingExtent.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/ChunkBatchingExtent.java
index 730edefea..4379a0550 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/ChunkBatchingExtent.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/ChunkBatchingExtent.java
@@ -73,7 +73,7 @@ public class ChunkBatchingExtent extends AbstractDelegateExtent {
     }
 
     public boolean commitRequired() {
-        return batches.size() > 0;
+        return enabled && batches.size() > 0;
     }
 
     @Override