From b333b58c05a0392f3fcf825028c058518a50d1c7 Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Mon, 18 May 2015 11:14:47 +0200 Subject: SPIGOT-893: Fix bridge method registering generic listeners twice --- src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/main') diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java index 687029fb..21187717 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -250,6 +250,11 @@ public final class JavaPluginLoader implements PluginLoader { for (final Method method : methods) { final EventHandler eh = method.getAnnotation(EventHandler.class); if (eh == null) continue; + // Do not register bridge or synthetic methods to avoid event duplication + // Fixes SPIGOT-893 + if (method.isBridge() || method.isSynthetic()) { + continue; + } final Class checkClass; 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()); -- cgit v1.2.3