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

Validate method parameters when registering events. Fixes BUKKIT-3779

Browse Source
This commit is contained in:
feildmaster 2013-03-16 17:17:09 -05:00
parent 7dcf22262a
commit 823c6c0ec6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,8 +380,8 @@ public class JavaPluginLoader implements PluginLoader {
for (final Method method : methods) { for (final Method method : methods) {
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;
if (!Event.class.isAssignableFrom(checkClass) || method.getParameterTypes().length != 1) { if (method.getParameterTypes().length != 1 || !Event.class.isAssignableFrom(checkClass = method.getParameterTypes()[0])) {
plugin.getLogger().severe(plugin.getDescription().getFullName() + " attempted to register an invalid EventHandler method signature \"" + method.toGenericString() + "\" in " + listener.getClass()); plugin.getLogger().severe(plugin.getDescription().getFullName() + " attempted to register an invalid EventHandler method signature \"" + method.toGenericString() + "\" in " + listener.getClass());
continue; continue;
} }