fix multi-couldmatcher logic mixup

DenizenScript · Nov 14, 2021 · db9db79 · db9db79
1 parent 4ae89dc
commit db9db79
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/com/denizenscript/denizencore/events/ScriptEvent.java b/src/main/java/com/denizenscript/denizencore/events/ScriptEvent.java
@@ -65,7 +65,7 @@ public static void registerCoreEvents() {
     public static void registerScriptEvent(ScriptEvent event) {
         events.add(event);
         eventLookup.put(CoreUtilities.toLowerCase(event.getName()), event);
-        if (!event.eventData.anyCouldMatchRegistered) {
+        if (event.eventData.couldMatchers.isEmpty() || event.eventData.needsLegacy) {
             legacyCouldMatchEvents.add(event);
         }
     }
@@ -115,9 +115,9 @@ public static class InternalEventData {
         public HashSet<String> localSwitches = new HashSet<>();
 
         /**
-         * If true, this event is inside couldMatchOptimizer.
+         * If true, this event needs to be in legacy event couldMatcher.
          */
-        public boolean anyCouldMatchRegistered = false;
+        public boolean needsLegacy = false;
     }
 
     /**
@@ -601,7 +601,9 @@ public final void registerCouldMatcher(String format) {
                 if (!list.contains(this)) {
                     list.add(this);
                 }
-                eventData.anyCouldMatchRegistered = true;
+            }
+            else {
+                eventData.needsLegacy = true;
             }
             return;
         }