From 9230661db615a8166a45aea414dabcb7fb8c63af Mon Sep 17 00:00:00 2001
From: ceikry <ironceikry@gmail.com>
Date: Mon, 28 Mar 2022 15:26:27 -0500
Subject: [PATCH] More unification work

---
 Server/src/main/kotlin/rs09/plugin/ClassScanner.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Server/src/main/kotlin/rs09/plugin/ClassScanner.kt b/Server/src/main/kotlin/rs09/plugin/ClassScanner.kt
index 9e9dcb2fe..15669b8a0 100644
--- a/Server/src/main/kotlin/rs09/plugin/ClassScanner.kt
+++ b/Server/src/main/kotlin/rs09/plugin/ClassScanner.kt
@@ -65,7 +65,7 @@ object ClassScanner {
     }
 
     fun load() {
-        val result = ClassGraph().enableClassInfo().enableAnnotationInfo().scan()
+        var result = ClassGraph().enableClassInfo().enableAnnotationInfo().scan()
         result.getClassesWithAnnotation("core.plugin.Initializable").forEach(Consumer { p: ClassInfo ->
             try {
                 definePlugin(p.loadClass().newInstance() as Plugin<Object>)
@@ -82,7 +82,7 @@ object ClassScanner {
             PlayerScripts.identifierMap[identifier] =
                 PlayerScripts.PlayerScript(identifier, description, name, res.loadClass())
         }
-        result.getClassesImplementing("api.StartupListener").filter { !it.isAbstract }.forEach {
+        result.getClassesImplementing("api.StartupListener").forEach {
             try {
                 val clazz = it.loadClass().newInstance() as StartupListener
                 GameWorld.startupListeners.add(clazz)