fix block grows couldmatch bork

DenizenScript · Jun 3, 2021 · 62a8a67 · 62a8a67
1 parent eba02f6
commit 62a8a67
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockGrowsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/BlockGrowsScriptEvent.java
@@ -56,7 +56,7 @@ public boolean couldMatch(ScriptPath path) {
             return true;
         }
         MaterialTag mat = MaterialTag.valueOf(block, CoreUtilities.noDebugContext);
-        return mat != null && !mat.isStructure();
+        return mat == null || !mat.isStructure();
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/flags/PlayerFlagHandler.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/flags/PlayerFlagHandler.java
@@ -175,10 +175,7 @@ public static AbstractFlagTracker getTrackerFor(UUID id) {
                 while (cache.loadingNow) {
                     if (System.currentTimeMillis() - start > 15 * 1000) {
                         Debug.echoError("Flag loading timeout, errors may follow");
-                        cache = playerFlagTrackerCache.remove(id);
-                        if (cache != null && !cache.loadingNow) {
-                            return cache.tracker;
-                        }
+                        playerFlagTrackerCache.remove(id);
                         return null;
                     }
                     try {