From 3b4aa59bfb6b4c5c3e5c2db37ae06da5b6a2553d Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 2 Oct 2022 12:03:29 +0100 Subject: [PATCH] Fixed startup bug --- eco-api/src/main/java/com/willfp/eco/core/Eco.java | 3 ++- .../kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/eco-api/src/main/java/com/willfp/eco/core/Eco.java b/eco-api/src/main/java/com/willfp/eco/core/Eco.java index c9f8d502..ae7d883e 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/Eco.java +++ b/eco-api/src/main/java/com/willfp/eco/core/Eco.java @@ -231,7 +231,8 @@ public interface Eco { /** * Create a Drop Queue. * - * @return The player.. + * @param player The player. + * @return The drop queue. */ @NotNull DropQueue createDropQueue(@NotNull Player player); diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt index 8e4bb8f4..0192bb48 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoImpl.kt @@ -66,6 +66,8 @@ import org.bukkit.persistence.PersistentDataContainer import java.net.URLClassLoader import java.util.UUID +private val loadedEcoPlugins = mutableMapOf() + @Suppress("UNUSED") class EcoImpl : EcoSpigotPlugin(), Eco { override val dataYml = DataYml(this) @@ -75,8 +77,6 @@ class EcoImpl : EcoSpigotPlugin(), Eco { this ) - private val loadedPlugins = mutableMapOf() - init { getProxy(CommonsInitializerProxy::class.java).init() } @@ -198,7 +198,7 @@ class EcoImpl : EcoSpigotPlugin(), Eco { factory.clean() } - loadedPlugins.remove(plugin.name.lowercase()) + loadedEcoPlugins.remove(plugin.name.lowercase()) for (customItem in Items.getCustomItems()) { if (customItem.key.namespace.equals(plugin.name.lowercase(), ignoreCase = true)) { @@ -219,14 +219,14 @@ class EcoImpl : EcoSpigotPlugin(), Eco { EcoProxyFactory(plugin) override fun addNewPlugin(plugin: EcoPlugin) { - loadedPlugins[plugin.name.lowercase()] = plugin + loadedEcoPlugins[plugin.name.lowercase()] = plugin } override fun getLoadedPlugins(): List = - loadedPlugins.keys.toList() + loadedEcoPlugins.keys.toList() override fun getPluginByName(name: String): EcoPlugin? = - loadedPlugins[name.lowercase()] + loadedEcoPlugins[name.lowercase()] override fun createFastItemStack(itemStack: ItemStack) = getProxy(FastItemStackFactoryProxy::class.java).create(itemStack)