Try to fix PerWorldPlugins in custom performance softwares of Spigot/…

…Paper without the class TimedRegisteredListener
TonimatasDEV · Feb 13, 2024 · 15a58e4 · 15a58e4
1 parent 3b7dca0
commit 15a58e4
Showing 1 changed file with 40 additions and 9 deletions.
diff --git a/src/main/java/net/tonimatasdev/perworldplugins/manager/ListenerManager.java b/src/main/java/net/tonimatasdev/perworldplugins/manager/ListenerManager.java
@@ -27,10 +27,24 @@ public static void convert() {
                     Field executorField = RegisteredListener.class.getDeclaredField("executor");
                     executorField.setAccessible(true);
 
-                    if (registeredListener instanceof TimedRegisteredListener) {
-                        // RegisteredListener to PerWorldTimedRegisteredListener.
-                        handlerList.register(new PerWorldTimedRegisteredListener(registeredListener.getListener(), (EventExecutor) executorField.get(registeredListener), registeredListener.getPriority(), registeredListener.getPlugin(), registeredListener.isIgnoringCancelled()));
-                    } else {
+                    // Create handled variable
+                    boolean handled = false;
+
+                    // Use try because, some performance server softwares delete TimedRegisteredListener class
+                    try {
+                        if (registeredListener instanceof TimedRegisteredListener) {
+                            // RegisteredListener to PerWorldTimedRegisteredListener.
+                            handlerList.register(new PerWorldTimedRegisteredListener(registeredListener.getListener(), (EventExecutor) executorField.get(registeredListener), registeredListener.getPriority(), registeredListener.getPlugin(), registeredListener.isIgnoringCancelled()));
+
+                            // Change handled to true
+                            handled = true;
+                        }
+                    } catch (Exception ignore) {
+                        // Do nothing
+                    }
+
+                    // Check if already handled
+                    if (!handled) {
                         // RegisteredListener to PerWorldRegisteredListener.
                         handlerList.register(new PerWorldRegisteredListener(registeredListener.getListener(), (EventExecutor) executorField.get(registeredListener), registeredListener.getPriority(), registeredListener.getPlugin(), registeredListener.isIgnoringCancelled()));
                     }
@@ -44,15 +58,32 @@ public static void convert() {
     }
 
     public static void setWorldsToEvents() {
+        // Get PerWorldPlugins
         Plugin perWorldPlugins = PerWorldPlugins.getInstance();
-
+        
         for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
+            // Check if the plugin is PerWorldPlugins
             if (plugin.equals(perWorldPlugins)) continue;
-
+            
             for (RegisteredListener registeredListener : HandlerList.getRegisteredListeners(plugin)) {
-                if (registeredListener instanceof PerWorldRegisteredListener) {
-                    ((PerWorldRegisteredListener) registeredListener).setDisabledWorlds();
-                } else if (registeredListener instanceof PerWorldTimedRegisteredListener){
+
+                // Create handled variable
+                boolean handled = false;
+
+                // Use try because, some performance server softwares delete TimedRegisteredListener class
+                try {
+                    if (registeredListener instanceof PerWorldRegisteredListener) {
+                        // RegisteredListener to PerWorldTimedRegisteredListener.
+                        ((PerWorldRegisteredListener) registeredListener).setDisabledWorlds();
+                        // Change handled to true
+                        handled = true;
+                    }
+                } catch (Exception ignore) {
+                    // Do nothing
+                }
+
+                // Check if it is handled or is a PerWorldTimeRegisteredListener
+                if (!handled && registeredListener instanceof PerWorldTimedRegisteredListener){
                     ((PerWorldTimedRegisteredListener) registeredListener).setDisabledWorlds();
                 }
             }