Fixed commands missing after loading a plugin

Lenni0451 · Jan 22, 2023 · 29f4f80 · 29f4f80
1 parent 0d5d251
commit 29f4f80
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/gradle.properties b/gradle.properties
@@ -6,5 +6,5 @@ org.gradle.configureondemand=true
 #Maven settings
 maven_name=SpigotPluginManager
 maven_group=net.lenni0451
-maven_version=2.7.2
+maven_version=2.7.3
 updatable=true
diff --git a/src/main/java/net/lenni0451/spm/utils/PluginUtils.java b/src/main/java/net/lenni0451/spm/utils/PluginUtils.java
@@ -252,6 +252,12 @@ public Plugin loadPlugin(final String name) {
 //            throw new IllegalStateException("Unable to add to plugin list");
             throw new IllegalStateException(I18n.t("pm.pluginutils.loadPlugin.notAdded"));
         }
+        try { //Synchronize the commands between client/server on newer versions
+            Method syncCommands = Bukkit.getServer().getClass().getDeclaredMethod("syncCommands");
+            syncCommands.setAccessible(true);
+            syncCommands.invoke(Bukkit.getServer());
+        } catch (Throwable ignored) {
+        }
         return targetPlugin;
     }
 
@@ -363,6 +369,12 @@ public void unloadPlugin(final Plugin plugin) {
             for (String s : I18n.mt("pm.pluginutils.unloadPlugin.unknownClassLoader")) Logger.sendConsole(s);
         }
 
+        try { //Synchronize the commands between client/server on newer versions
+            Method syncCommands = Bukkit.getServer().getClass().getDeclaredMethod("syncCommands");
+            syncCommands.setAccessible(true);
+            syncCommands.invoke(Bukkit.getServer());
+        } catch (Throwable ignored) {
+        }
         System.gc(); //Hopefully remove all leftover plugin classes and references
     }