protect against error when tag timings is enabled on 1.13 with the re…

…ceives message event active oddly specific error circumstance time!
DenizenScript · Sep 4, 2019 · fdd33a0 · fdd33a0
1 parent a0bf19b
commit fdd33a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/DenizenCoreImplementation.java b/plugin/src/main/java/com/denizenscript/denizen/DenizenCoreImplementation.java
@@ -376,10 +376,17 @@ public boolean allowedToWebget() {
         return Settings.allowWebget();
     }
 
+    public static Thread tagThread = null;
+
+    public static boolean isSafeThread() {
+        return Bukkit.isPrimaryThread() || Thread.currentThread().equals(tagThread);
+    }
+
     @Override
     public void preTagExecute() {
         try {
             NMSHandler.getInstance().disableAsyncCatcher();
+            tagThread = Thread.currentThread();
         }
         catch (Throwable e) {
             Debug.echoError("Running not-Spigot?!");

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/DenizenPacketHandler.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/DenizenPacketHandler.java
@@ -1,5 +1,6 @@
 package com.denizenscript.denizen.utilities.packets;
 
+import com.denizenscript.denizen.DenizenCoreImplementation;
 import com.denizenscript.denizen.nms.interfaces.packets.*;
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizen.events.player.PlayerReceivesMessageScriptEvent;
@@ -105,7 +106,7 @@ else if (event.rawJsonModified) {
                     return false;
                 }
             });
-            if (Bukkit.isPrimaryThread()) {
+            if (DenizenCoreImplementation.isSafeThread()) {
                 futureTask.run();
             }
             else {