Update ScriptLoader.java (#3766)

SkriptLang · Mar 3, 2021 · 1f958b7 · 1f958b7
1 parent dd0eb8d
commit 1f958b7
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java
@@ -148,6 +148,22 @@ public static void deleteCurrentEvent() {
 		hasDelayBefore = Kleenean.FALSE;
 	}
 
+	@Nullable
+	private static SkriptEvent currentSkriptEvent;
+
+	public static void setCurrentSkriptEvent(SkriptEvent skriptEvent) {
+		currentSkriptEvent = skriptEvent;
+	}
+
+	@Nullable
+	public static SkriptEvent getCurrentSkriptEvent() {
+		return currentSkriptEvent;
+	}
+
+	public static void deleteCurrentSkriptEvent() {
+		currentSkriptEvent = null;
+	}
+
 	public static List<TriggerSection> currentSections = new ArrayList<>();
 	public static List<Loop> currentLoops = new ArrayList<>();
 	final static HashMap<String, String> currentOptions = new HashMap<>();
@@ -675,9 +691,11 @@ public String run(final Matcher m) {
 
 					try {
 						setCurrentEvent("" + parsedEvent.getFirst().getName().toLowerCase(Locale.ENGLISH), parsedEvent.getFirst().events);
+						setCurrentSkriptEvent(parsedEvent.getSecond());
 						events.add(new ParsedEventData(parsedEvent, event, node, loadItems(node)));
 					} finally {
 						deleteCurrentEvent();
+						deleteCurrentSkriptEvent();
 					}
 
 					if (parsedEvent.getSecond() instanceof SelfRegisteringSkriptEvent) {
@@ -723,6 +741,7 @@ public String run(final Matcher m) {
 
 				for (ParsedEventData event : events) {
 					setCurrentEvent("" + event.info.getFirst().getName().toLowerCase(Locale.ENGLISH), event.info.getFirst().events);
+					setCurrentSkriptEvent(event.info.getSecond());
 
 					final Trigger trigger;
 					try {
@@ -741,6 +760,7 @@ public String run(final Matcher m) {
 					}
 
 					deleteCurrentEvent();
+					deleteCurrentSkriptEvent();
 				}
 
 				// Remove the script from the disabled scripts list