From 4dcf8aabea54c3041a0767ddc519cc30a01a70dc Mon Sep 17 00:00:00 2001 From: Mooy1 Date: Sat, 6 Mar 2021 00:55:12 -0600 Subject: [PATCH] fix addon inventories bug with non-default worlds --- .../slimefun4/implementation/SlimefunPlugin.java | 3 --- .../slimefun4/implementation/tasks/SlimefunStartupTask.java | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java index 7cf23dabc..78649fee5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java @@ -667,9 +667,6 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { // Handle Slimefun Guide being given on Join new SlimefunGuideListener(this, config.getBoolean("guide.receive-on-first-join")); - // Load/Unload Worlds in Slimefun - new WorldListener(this); - // Clear the Slimefun Guide History upon Player Leaving new PlayerProfileListener(this); } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/SlimefunStartupTask.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/SlimefunStartupTask.java index d66081420..1b14c239e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/SlimefunStartupTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/SlimefunStartupTask.java @@ -4,6 +4,7 @@ import java.util.logging.Level; import javax.annotation.Nonnull; +import io.github.thebusybiscuit.slimefun4.implementation.listeners.WorldListener; import org.bukkit.Bukkit; import org.bukkit.World; @@ -56,6 +57,9 @@ public class SlimefunStartupTask implements Runnable { SlimefunPlugin.logger().log(Level.SEVERE, x, () -> "An Error occurred while trying to load World \"" + world.getName() + "\" for Slimefun v" + SlimefunPlugin.getVersion()); } } + + // Load/Unload Worlds, only after all plugins have started up. + new WorldListener(this.plugin); // Only load this Listener if the corresponding items are enabled if (isEnabled("ELEVATOR_PLATE", "GPS_ACTIVATION_DEVICE_SHARED", "GPS_ACTIVATION_DEVICE_PERSONAL")) {