From 7886947061d6da2c14d229099f0105c3fd9c93a5 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Mon, 3 Oct 2016 03:16:04 +1100
Subject: [PATCH] Disable combine stages for nukkit

---
 core/src/main/java/com/boydti/fawe/Fawe.java              | 8 ++++----
 .../java/com/boydti/fawe/nukkit/core/NukkitWorldEdit.java | 2 ++
 .../com/boydti/fawe/nukkit/optimization/FaweNukkit.java   | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/com/boydti/fawe/Fawe.java b/core/src/main/java/com/boydti/fawe/Fawe.java
index 21a7f8ac..19854fea 100644
--- a/core/src/main/java/com/boydti/fawe/Fawe.java
+++ b/core/src/main/java/com/boydti/fawe/Fawe.java
@@ -337,9 +337,9 @@ public class Fawe {
          */
         try {
             EditSession.inject(); // Custom block placer + optimizations
-            EditSessionEvent.inject(); // Add EditSession to event
-            LocalSession.inject(); // Add remember order / queue flushing
-            SessionManager.inject(); // Custom session saving
+            EditSessionEvent.inject(); // Add EditSession to event (API)
+            LocalSession.inject(); // Add remember order / queue flushing / Optimizations for disk
+            SessionManager.inject(); // Faster custom session saving + Memory improvements
             Request.inject(); // Custom pattern extent
             // Commands
             BrushCommands.inject(); // Translations + heightmap
@@ -349,7 +349,7 @@ public class Fawe {
             ScriptingCommands.inject(); // Translations
             SelectionCommand.inject(); // Translations + set optimizations
             RegionCommands.inject(); // Translations
-            HistoryCommands.inject(); // Translations
+            HistoryCommands.inject(); // Translations + rollback command
             NavigationCommands.inject(); // Translations + thru fix
             ParametricBuilder.inject(); // Translations
             ToolUtilCommands.inject(); // Fixes + Translations
diff --git a/nukkit/src/main/java/com/boydti/fawe/nukkit/core/NukkitWorldEdit.java b/nukkit/src/main/java/com/boydti/fawe/nukkit/core/NukkitWorldEdit.java
index 4ecce879..d35c8609 100644
--- a/nukkit/src/main/java/com/boydti/fawe/nukkit/core/NukkitWorldEdit.java
+++ b/nukkit/src/main/java/com/boydti/fawe/nukkit/core/NukkitWorldEdit.java
@@ -25,6 +25,7 @@ import cn.nukkit.command.Command;
 import cn.nukkit.command.CommandSender;
 import cn.nukkit.plugin.PluginBase;
 import com.boydti.fawe.Fawe;
+import com.boydti.fawe.config.Settings;
 import com.boydti.fawe.nukkit.optimization.FaweNukkit;
 import com.google.common.base.Joiner;
 import com.sk89q.util.yaml.YAMLProcessor;
@@ -74,6 +75,7 @@ public class NukkitWorldEdit extends PluginBase {
     public void onEnable() {
         try {
             Fawe.set(new FaweNukkit(this));
+            Settings.HISTORY.COMBINE_STAGES = false;
             logger = Logger.getLogger(NukkitWorldEdit.class.getCanonicalName());
             createDefaultConfiguration("config-basic.yml");
             config = new NukkitConfiguration(new YAMLProcessor(new File(getDataFolder(), "config-basic.yml"), true), this);
diff --git a/nukkit/src/main/java/com/boydti/fawe/nukkit/optimization/FaweNukkit.java b/nukkit/src/main/java/com/boydti/fawe/nukkit/optimization/FaweNukkit.java
index 54efd519..1eb5110e 100644
--- a/nukkit/src/main/java/com/boydti/fawe/nukkit/optimization/FaweNukkit.java
+++ b/nukkit/src/main/java/com/boydti/fawe/nukkit/optimization/FaweNukkit.java
@@ -97,11 +97,13 @@ public class FaweNukkit implements IFawe, Listener {
 
     @Override
     public FaweQueue getNewQueue(World world, boolean fast) {
+        Settings.HISTORY.COMBINE_STAGES = false;
         return new NukkitQueue(this, world);
     }
 
     @Override
     public FaweQueue getNewQueue(String world, boolean fast) {
+        Settings.HISTORY.COMBINE_STAGES = false;
         return new NukkitQueue(this, world);
     }