Improved ReflectionUtil to deduplicate classes

rayzrdev · Apr 19, 2019 · 96cc6c1 · 96cc6c1
1 parent 63ca98a
commit 96cc6c1
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/me/rayzr522/eventchecker/util/ReflectionUtil.java b/src/main/java/me/rayzr522/eventchecker/util/ReflectionUtil.java
@@ -9,16 +9,17 @@
 import java.util.stream.Collectors;
 
 public class ReflectionUtil {
-    private static final Map<ClassLoader, List<Class<? extends Event>>> eventClassCache = new HashMap<>();
+    private static final Map<ClassLoader, List<Class<Event>>> eventClassCache = new HashMap<>();
 
     public static List<Class<? extends Event>> getAllEventClasses() {
         return Arrays.stream(Bukkit.getServer().getPluginManager().getPlugins())
                 .flatMap(plugin -> getEventClasses(plugin.getClass().getClassLoader()).stream())
+                .distinct()
                 .collect(Collectors.toList());
     }
 
     @SuppressWarnings({"unchecked", "UnstableApiUsage"})
-    public static List<Class<? extends Event>> getEventClasses(ClassLoader classLoader) {
+    public static List<Class<Event>> getEventClasses(ClassLoader classLoader) {
         return eventClassCache.computeIfAbsent(classLoader, loader -> {
             try {
                 return ClassPath.from(classLoader).getTopLevelClasses().stream()
@@ -39,7 +40,7 @@ public static List<Class<? extends Event>> getEventClasses(ClassLoader classLoad
                                 return false;
                             }
                         })
-                        .map(eventClass -> (Class<? extends Event>) eventClass)
+                        .map(eventClass -> (Class<Event>) eventClass)
                         .collect(Collectors.toList());
             } catch (IOException e) {
                 e.printStackTrace();