Azimkin/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow inherited methods to be event handlers. Addresses BUKKIT-2299

Browse Source 
This change lets JavaPluginLoader use a temporary HashSet to store
methods that could possibly have the EventHandler annotation. Duplicates
are prevented by the nature of a Set.

Registering parent listeners is a breaking change for any listener
extending another listener and expecting parent listeners to not be
called. Changing this is justified by the ease-of-use and proper object
inheritance design. If this is undesired behavior, the method may be
overridden without reapplying the method with the EventHandler notation.
This commit is contained in:
Wesley Wolfe 2012-08-26 21:14:28 -05:00
parent e04c1c2a18
commit 555c40e387
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
View File

@ -276,16 +276,22 @@ public class JavaPluginLoader implements PluginLoader {
boolean useTimings = server.getPluginManager().useTimings(); boolean useTimings = server.getPluginManager().useTimings();
Map<Class<? extends Event>, Set<RegisteredListener>> ret = new HashMap<Class<? extends Event>, Set<RegisteredListener>>(); Map<Class<? extends Event>, Set<RegisteredListener>> ret = new HashMap<Class<? extends Event>, Set<RegisteredListener>>();
Method[] methods; Set<Method> methods;
try { try {
methods = listener.getClass().getDeclaredMethods(); Method[] publicMethods = listener.getClass().getMethods();
methods = new HashSet<Method>(publicMethods.length, Float.MAX_VALUE);
for (Method method : publicMethods) {
methods.add(method);
}
for (Method method : listener.getClass().getDeclaredMethods()) {
methods.add(method);
}
} catch (NoClassDefFoundError e) { } catch (NoClassDefFoundError e) {
plugin.getLogger().severe("Plugin " + plugin.getDescription().getFullName() + " has failed to register events for " + listener.getClass() + " because " + e.getMessage() + " does not exist."); plugin.getLogger().severe("Plugin " + plugin.getDescription().getFullName() + " has failed to register events for " + listener.getClass() + " because " + e.getMessage() + " does not exist.");
return ret; return ret;
} }
for (int i = 0; i < methods.length; i++) { for (final Method method : methods) {
final Method method = methods[i];
final EventHandler eh = method.getAnnotation(EventHandler.class); final EventHandler eh = method.getAnnotation(EventHandler.class);
if (eh == null) continue; if (eh == null) continue;
final Class<?> checkClass = method.getParameterTypes()[0]; final Class<?> checkClass = method.getParameterTypes()[0];