Fix loading in 1.15/1.14

DenizenScript · Jan 15, 2021 · eeac5a0 · eeac5a0
1 parent f70d5e6
commit eeac5a0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/Denizen.java b/plugin/src/main/java/com/denizenscript/denizen/Denizen.java
@@ -5,6 +5,7 @@
 import com.denizenscript.denizen.events.server.ServerPrestartScriptEvent;
 import com.denizenscript.denizen.events.server.ServerStartScriptEvent;
 import com.denizenscript.denizen.events.server.ServerStopScriptEvent;
+import com.denizenscript.denizen.nms.NMSVersion;
 import com.denizenscript.denizen.objects.InventoryTag;
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizen.objects.notable.NotableManager;
@@ -415,7 +416,7 @@ public void run() {
                         }
                     }, 1, 1);
                     InventoryTag.setupInventoryTracker();
-                    if (!MapTagBasedFlagTracker.skipAllCleanings) {
+                    if (!MapTagBasedFlagTracker.skipAllCleanings && NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16)) {
                         for (World world : Bukkit.getWorlds()) {
                             for (Chunk chunk : world.getLoadedChunks()) {
                                 new DataPersistenceFlagTracker(chunk).doTotalClean();

diff --git a/.../main/java/com/denizenscript/denizen/scripts/containers/core/BukkitWorldScriptHelper.java b/.../main/java/com/denizenscript/denizen/scripts/containers/core/BukkitWorldScriptHelper.java
@@ -3,6 +3,7 @@
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.events.world.TimeChangeScriptEvent;
 import com.denizenscript.denizen.nms.NMSHandler;
+import com.denizenscript.denizen.nms.NMSVersion;
 import com.denizenscript.denizen.objects.*;
 import com.denizenscript.denizen.utilities.ScoreboardHelper;
 import com.denizenscript.denizen.utilities.debugging.Debug;
@@ -115,6 +116,9 @@ public void playerQuit(PlayerQuitEvent event) {
 
     @EventHandler
     public void chunkLoadEvent(ChunkLoadEvent event) {
+        if (!NMSHandler.getVersion().isAtLeast(NMSVersion.v1_16)) {
+            return;
+        }
         if (MapTagBasedFlagTracker.skipAllCleanings) {
             return;
         }