Allow SkriptEvent to specify Event classes for ParserInstance (Skript…

…Lang#4195)
Sorbon-CH · Jan 18, 2022 · bc8458f · bc8458f
1 parent 581c8a8
commit bc8458f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java
@@ -742,9 +742,12 @@ private static ScriptInfo loadScript(@Nullable Config config) {
 
 					if (Skript.debug() || node.debug())
 						Skript.debug(event + " (" + parsedEvent.getSecond().toString(null, true) + "):");
-
+
+					Class<? extends Event>[] eventClasses = parsedEvent.getSecond().getEventClasses();
+					if (eventClasses == null)
+						eventClasses = parsedEvent.getFirst().events;
 					try {
-						getParser().setCurrentEvent("" + parsedEvent.getFirst().getName().toLowerCase(Locale.ENGLISH), parsedEvent.getFirst().events);
+						getParser().setCurrentEvent(parsedEvent.getFirst().getName().toLowerCase(Locale.ENGLISH), eventClasses);
 						getParser().setCurrentSkriptEvent(parsedEvent.getSecond());
 						events.add(new ParsedEventData(parsedEvent, event, node, loadItems(node)));
 					} finally {
@@ -788,7 +791,10 @@ private static ScriptInfo loadScript(@Nullable Config config) {
 			}
 
 			for (ParsedEventData event : events) {
-				getParser().setCurrentEvent("" + event.info.getFirst().getName().toLowerCase(Locale.ENGLISH), event.info.getFirst().events);
+				Class<? extends Event>[] eventClasses = event.info.getSecond().getEventClasses();
+				if (eventClasses == null)
+					eventClasses = event.info.getFirst().events;
+				getParser().setCurrentEvent(event.info.getFirst().getName().toLowerCase(Locale.ENGLISH), eventClasses);
 				getParser().setCurrentSkriptEvent(event.info.getSecond());
 
 				Trigger trigger;

diff --git a/src/main/java/ch/njol/skript/lang/SkriptEvent.java b/src/main/java/ch/njol/skript/lang/SkriptEvent.java
@@ -73,6 +73,14 @@ public boolean shouldLoadEvent() {
 		return true;
 	}
 
+	/**
+	 * @return the Event classes to use in {@link ch.njol.skript.lang.parser.ParserInstance},
+	 * or {@code null} if the Event classes this SkriptEvent was registered with should be used.
+	 */
+	public Class<? extends Event> @Nullable[] getEventClasses() {
+		return null;
+	}
+
 	@Override
 	public String toString() {
 		return toString(null, false);