Merge pull request #3217 from Multiverse/fix/unregister

benwoo1110 · web-flow · commit 42cd9ec18d23 · 2025-05-03T20:21:09.000+08:00
Fix incorrect way of unregistering MultiverseCoreApi from service manager
diff --git a/src/main/java/org/mvplugins/multiverse/core/MultiverseCoreApi.java b/src/main/java/org/mvplugins/multiverse/core/MultiverseCoreApi.java
@@ -33,8 +33,8 @@ static void init(@NotNull MultiverseCore multiverseCore) {
     }
 
     static void shutdown() {
+        Bukkit.getServicesManager().unregister(instance);
         instance = null;
-        Bukkit.getServicesManager().unregister(MultiverseCoreApi.class);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ static void init(@NotNull MultiverseCore multiverseCore) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`static void shutdown() {`
	`36`	`+ Bukkit.getServicesManager().unregister(instance);`
`36`	`37`	`instance = null;`
`37`		`- Bukkit.getServicesManager().unregister(MultiverseCoreApi.class);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`