From be58cd42ac62811c1c555d92f7f784d4a2ae2701 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Mon, 11 May 2020 16:09:31 +0100
Subject: [PATCH] Add option to disable ticking existing blocks when not
 fastmode

---
 .../java/com/boydti/fawe/bukkit/adapter/NMSAdapter.java     | 5 +++--
 .../src/main/java/com/boydti/fawe/config/Settings.java      | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/NMSAdapter.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/NMSAdapter.java
index 09e672526..0160fdd51 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/NMSAdapter.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/NMSAdapter.java
@@ -29,7 +29,7 @@ public class NMSAdapter {
                     air++;
                     break;
                 default:
-                    if (!tick_placed && !tick_placed) {
+                    if (!fastmode && !tick_placed) {
                         boolean ticking;
                         if (ordinal != lastOrdinal) {
                             ticking = BlockTypesCache.ticking[ordinal];
@@ -68,6 +68,7 @@ public class NMSAdapter {
         char lastOrdinal = BlockID.__RESERVED__;
         boolean lastticking = false;
         boolean tick_placed = Settings.IMP.EXPERIMENTAL.ALLOW_TICK_PLACED;
+        boolean tick_existing = Settings.IMP.EXPERIMENTAL.ALLOW_TICK_EXISTING;
         for (int i = 0; i < 4096; i++) {
             char ordinal = set[i];
             switch (ordinal) {
@@ -85,7 +86,7 @@ public class NMSAdapter {
                             air++;
                             break;
                         default:
-                            if (!fastmode && !tick_placed) {
+                            if (!fastmode && !tick_placed && tick_existing) {
                                 boolean ticking;
                                 if (ordinal != lastOrdinal) {
                                     ticking = BlockTypesCache.ticking[ordinal];
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 07783b8da..2dea1937d 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
@@ -380,6 +380,12 @@ public class Settings extends Config {
             "This has no effect on existing blocks one way or the other."
         })
         public boolean ALLOW_TICK_PLACED = false;
+
+        @Comment({
+            "Force re-ticking of existing blocks not edited by FAWE.",
+            "This will increase time taken slightly."
+        })
+        public boolean ALLOW_TICK_EXISTING = true;
     }
 
     public static class WEB {