Skip to content

Fix legacy event registrations not getting the correct origin class for shared event classes (SimpleEvent) #8971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eyesniper2 wants to merge 2 commits into
base: dev/patch
Choose a base branch
from
Open

Fix legacy event registrations not getting the correct origin class for shared event classes (SimpleEvent) #8971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcf79bd
Use the registering class as the origin for legacy event registration
eyesniper2 Nov 14, 2026
0d9925f
Remove unused ModernSkriptEventInfo constructor
eyesniper2 Nov 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion src/main/java/ch/njol/skript/Skript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1488,6 +1488,23 @@ public static Origin getSyntaxOrigin(Class<?> source) {
return Origin.UNKNOWN;
}

private static final StackWalker STACK_WALKER =
StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);

/**
* Finds the first class outside of {@link Skript} in the current call stack,
* which is the class that invoked a legacy registration method.
* @param fallback The class to return if no such class is found.
* @return The registering class, or {@code fallback}.
*/
private static Class<?> getRegisteringClass(Class<?> fallback) {
return STACK_WALKER.walk(frames -> frames
.map(StackWalker.StackFrame::getDeclaringClass)
.filter(declaringClass -> declaringClass != Skript.class)
.findFirst()
.orElse(fallback));
}

/**
* Registers a {@link Condition}.
*
Expand Down Expand Up @@ -1711,7 +1728,16 @@ public static <E extends SkriptEvent> SkriptEventInfo<E> registerEvent(
checkAcceptRegistrations();
for (int i = 0; i < patterns.length; i++)
patterns[i] = BukkitSyntaxInfos.fixPattern(patterns[i]);
var legacy = new SkriptEventInfo.ModernSkriptEventInfo<>(name, patterns, eventClass, "", events);

// Event classes may be shared between addons (e.g. SimpleEvent), so the origin is
// determined from the class that registered the event rather than the event class.
Class<?> registeringClass = getRegisteringClass(eventClass);
Origin origin = getSyntaxOrigin(registeringClass);
if (origin == Origin.UNKNOWN)
origin = getSyntaxOrigin(eventClass);

var legacy = new SkriptEventInfo.ModernSkriptEventInfo<>(
name, patterns, eventClass, registeringClass.getName(), events, origin);
skript.syntaxRegistry().register(BukkitSyntaxInfos.Event.KEY, legacy);
return legacy;
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/ch/njol/skript/lang/SkriptEventInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package ch.njol.skript.lang;

import ch.njol.skript.Skript;
import ch.njol.skript.SkriptAPIException;
import ch.njol.skript.SkriptConfig;
import ch.njol.skript.lang.SkriptEvent.ListeningBehavior;
Expand Down Expand Up @@ -248,9 +247,10 @@ public static final class ModernSkriptEventInfo<E extends SkriptEvent>

private final Origin origin;

public ModernSkriptEventInfo(String name, String[] patterns, Class<E> eventClass, String originClassPath, Class<? extends Event>[] events) {
public ModernSkriptEventInfo(String name, String[] patterns, Class<E> eventClass, String originClassPath,
Class<? extends Event>[] events, Origin origin) {
super(name, patterns, eventClass, originClassPath, events);
this.origin = Skript.getSyntaxOrigin(eventClass);
this.origin = origin;
}

@Override
Expand Down
Loading