Shutting down hooked EventManager

Elytrium · Jul 22, 2022 · 43af4ff · 43af4ff
1 parent 17d48bc
commit 43af4ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/plugin/src/main/java/net/elytrium/limboapi/LimboAPI.java b/plugin/src/main/java/net/elytrium/limboapi/LimboAPI.java
@@ -172,6 +172,8 @@ public LimboAPI(Logger logger, ProxyServer server, Metrics.Factory metricsFactor
         LimboProtocol.init();
       } catch (ReflectiveOperationException e) {
         throw new ReflectionException(e);
+      } catch (InterruptedException e) {
+        e.printStackTrace();
       }
     }
   }

diff --git a/plugin/src/main/java/net/elytrium/limboapi/injection/event/EventManagerHook.java b/plugin/src/main/java/net/elytrium/limboapi/injection/event/EventManagerHook.java
@@ -209,10 +209,10 @@ public void reloadHandlers() throws IllegalAccessException {
     }
   }
 
-  public static void init(LimboAPI plugin) throws ReflectiveOperationException {
+  public static void init(LimboAPI plugin) throws ReflectiveOperationException, InterruptedException {
     VelocityServer server = plugin.getServer();
     EventManager newEventManager = new EventManagerHook(server.getPluginManager(), plugin);
-    EventManager oldEventManager = server.getEventManager();
+    VelocityEventManager oldEventManager = server.getEventManager();
     HANDLERS_BY_TYPE_FIELD.set(newEventManager, HANDLERS_BY_TYPE_FIELD.get(oldEventManager));
     HANDLERS_CACHE_FIELD.set(newEventManager, HANDLERS_CACHE_FIELD.get(oldEventManager));
     UNTARGETED_METHOD_HANDLERS_FIELD.set(newEventManager, UNTARGETED_METHOD_HANDLERS_FIELD.get(oldEventManager));
@@ -221,5 +221,7 @@ public static void init(LimboAPI plugin) throws ReflectiveOperationException {
 
     VELOCITY_SERVER_EVENT_MANAGER_FIELD.set(server, newEventManager);
     VELOCITY_COMMAND_MANAGER_EVENT_MANAGER_FIELD.set(server.getCommandManager(), newEventManager);
+
+    oldEventManager.shutdown();
   }
 }