Merge pull request #92 from SkriptLang/fix-event-parsing

Ensure lastWhich is set correctly for CustomEvent parsing
SkriptLang · Feb 1, 2024 · c0a5cb3 · c0a5cb3
2 parents d49527b + 28f4893
commit c0a5cb3
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/main/java/org/skriptlang/reflect/syntax/event/elements/CustomEvent.java b/src/main/java/org/skriptlang/reflect/syntax/event/elements/CustomEvent.java
@@ -76,6 +76,14 @@ public boolean init(Literal<?>[] args, int matchedPattern, SkriptParser.ParseRes
     return event.isMarkedContinue();
   }
 
+  @Override
+  public boolean load() {
+    CustomEvent.setLastWhich(which);
+    boolean parsed = super.load();
+    CustomEvent.setLastWhich(null);
+    return parsed;
+  }
+
   @Override
   public boolean check(Event e) {
     BukkitCustomEvent bukkitCustomEvent = (BukkitCustomEvent) e;