From 1cd2d8d1219b2651c705240425c3b376e6e15b5f Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Tue, 8 Jun 2021 14:15:43 +0100
Subject: [PATCH] Send before history is acttually safer at the moment  -
 avoids deadlocks

---
 .../processors/ExtentBatchProcessorHolder.java       |  2 +-
 .../main/java/com/boydti/fawe/config/Settings.java   | 12 ++++++------
 .../main/java/com/sk89q/worldedit/extent/Extent.java |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/processors/ExtentBatchProcessorHolder.java b/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/processors/ExtentBatchProcessorHolder.java
index 8272ec74c..49bc3d722 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/processors/ExtentBatchProcessorHolder.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/processors/ExtentBatchProcessorHolder.java
@@ -20,7 +20,7 @@ public abstract class ExtentBatchProcessorHolder extends BatchProcessorHolder im
 
     @Override
     public Extent enableHistory(AbstractChangeSet changeSet) {
-        if (Settings.IMP.EXPERIMENTAL.SEND_BEFORE_HISTORY) {
+        if (Settings.IMP.HISTORY.SEND_BEFORE_HISTORY) {
             return this.addPostProcessor(changeSet);
         } else {
             return this.addProcessor(changeSet);
diff --git a/worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java b/worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java
index 1e0f4be92..3127fad6a 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java
@@ -192,6 +192,12 @@ public class Settings extends Config {
                 " - Slightly worse compression since dispatch order is different",
         })
         public boolean COMBINE_STAGES = true;
+        @Comment({
+            "Do not wait for a chunk's history to save before sending it",
+            " - Undo/redo commands will wait until the history has been written to disk before executing",
+            " - Requires combine-stages = true"
+        })
+        public boolean SEND_BEFORE_HISTORY = true;
         @Comment({
                 "Higher compression reduces the size of history at the expense of CPU",
                 "0 = Uncompressed byte array (fastest)",
@@ -381,12 +387,6 @@ public class Settings extends Config {
             "This will increase time taken slightly."
         })
         public boolean ALLOW_TICK_EXISTING = true;
-        @Comment({
-            "[SAFE] Do not wait for a chunk's history to save before sending it",
-            " - Undo/redo commands will wait until the history has been written to disk before executing",
-            " - Requires combine_stages = true"
-        })
-        public boolean SEND_BEFORE_HISTORY = false;
 
         @Comment({
                 "Sets a maximum limit (in kb) for the size of a player's schematics directory (per-player mode only)",
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/Extent.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/Extent.java
index c5946ddb7..79d96f16c 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/Extent.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/Extent.java
@@ -719,7 +719,7 @@ public interface Extent extends InputExtent, OutputExtent {
     }
 
     default Extent enableHistory(AbstractChangeSet changeSet) {
-        if (Settings.IMP.EXPERIMENTAL.SEND_BEFORE_HISTORY) {
+        if (Settings.IMP.HISTORY.SEND_BEFORE_HISTORY) {
             return addPostProcessor(changeSet);
         } else {
             return addProcessor(changeSet);