1.5.6.5 (fixed some reload issues)

boiscljo · Apr 16, 2022 · 8e3ab00 · 8e3ab00
1 parent 378d222
commit 8e3ab00
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-SBA_VERSION=1.5.6.4
+SBA_VERSION=1.5.6.5
 
 PAPER_LEGACY_VERSION=1.16.5
 JUPITER_VERSION=5.7.2

diff --git a/plugin/src/main/java/io/github/pronze/sba/utils/SBAUtil.java b/plugin/src/main/java/io/github/pronze/sba/utils/SBAUtil.java
@@ -100,26 +100,24 @@ public static void disablePlugin(@NotNull JavaPlugin plugin) {
                     + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
         }
 
-        try {
+        /*try {
             // Bukkit.getServicesManager().unregisterAll(plugin);
         } catch (Throwable ex) {
             Bukkit.getLogger().log(Level.SEVERE,
                     "Error occurred (in the plugin loader) while unregistering services for "
                             + plugin.getDescription().getFullName() + " (Is it up to date?)",
                     ex);
-        }
+        }*/
 
         try {
             var handlers = HandlerList.getRegisteredListeners(plugin);
             Logger.trace("-----------------------{}-----------------", handlers.size());
             for (var handler : handlers) {
-                //if (handler.getListener().toString().contains("io.github.pronze.sba") ||
-                //        handler.getListener().toString().contains("io.github.pronze.lib.screaming") ||
-                //        handler.getListener().toString().contains("io.github.pronze.lib.simpleinventories") ||
-                //        handler.getListener().toString().contains("org.screamingsandals.bedwars.lib.sgui") ||
-                //        handler.getListener().toString().contains("io.github.pronze.lib.bedwars")) {
+                String id = handler.getListener().toString();
+                if (!id.contains("BukkitAudiencesImpl") && !id.contains("CloudBukkitListener")
+                        && !id.contains("CommodoreImpl$ServerReloadListener")) {
                     HandlerList.unregisterAll(handler.getListener());
-                //}
+                }
                 Logger.trace("handler {}", handler.getListener().toString());
             }
             Logger.trace("-----------------------{}-----------------", handlers.size());