diff --git a/src/main/java/org/mvplugins/multiverse/inventories/MultiverseInventories.java b/src/main/java/org/mvplugins/multiverse/inventories/MultiverseInventories.java index ad16e0b0..c1e1bf88 100644 --- a/src/main/java/org/mvplugins/multiverse/inventories/MultiverseInventories.java +++ b/src/main/java/org/mvplugins/multiverse/inventories/MultiverseInventories.java @@ -128,7 +128,7 @@ public final void onEnable() { this.playerNamesMapperProvider.get().loadMap(); // Init api - MultiverseInventoriesApi.init(this.serviceLocator); + MultiverseInventoriesApi.init(this); Logging.config("Version %s (API v%s) Enabled - By %s", this.getDescription().getVersion(), getVersionAsNumber(), StringFormatter.joinAnd(this.getDescription().getAuthors())); diff --git a/src/main/java/org/mvplugins/multiverse/inventories/MultiverseInventoriesApi.java b/src/main/java/org/mvplugins/multiverse/inventories/MultiverseInventoriesApi.java index 46c32213..ff1d7902 100644 --- a/src/main/java/org/mvplugins/multiverse/inventories/MultiverseInventoriesApi.java +++ b/src/main/java/org/mvplugins/multiverse/inventories/MultiverseInventoriesApi.java @@ -1,6 +1,9 @@ package org.mvplugins.multiverse.inventories; +import org.bukkit.Bukkit; +import org.bukkit.plugin.ServicePriority; import org.jetbrains.annotations.NotNull; +import org.mvplugins.multiverse.core.MultiverseCoreApi; import org.mvplugins.multiverse.core.inject.PluginServiceLocator; import org.mvplugins.multiverse.inventories.config.InventoriesConfig; import org.mvplugins.multiverse.inventories.dataimport.DataImportManager; @@ -19,14 +22,16 @@ public final class MultiverseInventoriesApi { private static MultiverseInventoriesApi instance; - static void init(@NotNull PluginServiceLocator serviceLocator) { + static void init(@NotNull MultiverseInventories multiverseInventories) { if (instance != null) { throw new IllegalStateException("MultiverseCoreApi has already been initialized!"); } - instance = new MultiverseInventoriesApi(serviceLocator); + instance = new MultiverseInventoriesApi(multiverseInventories.getServiceLocator()); + Bukkit.getServicesManager().register(MultiverseInventoriesApi.class, instance, multiverseInventories, ServicePriority.Normal); } static void shutdown() { + Bukkit.getServicesManager().unregister(instance); instance = null; }