Fixes bug where Warps would not hook with no game modes

#77
BentoBoxWorld · May 21, 2020 · 9c4a224 · 9c4a224
1 parent 75feedb
commit 9c4a224
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/main/java/world/bentobox/warps/Warp.java b/src/main/java/world/bentobox/warps/Warp.java
@@ -84,7 +84,7 @@ public void onLoad()
         // Save default config.yml
         this.saveDefaultConfig();
         // Load the plugin's config
-        if (this.loadSettings() && settings.isAllowInOtherWorlds()) {
+        if (this.loadSettings() && getSettings().isAllowInOtherWorlds()) {
             // Load the master warp and warps command
             new WarpCommand(this);
             new WarpsCommand(this);
@@ -100,7 +100,7 @@ public void onReload()
     {
         super.onReload();
 
-        if (this.hooked) {
+        if (this.hooked || getSettings().isAllowInOtherWorlds()) {
             this.warpSignsManager.saveWarpList();
 
             this.loadSettings();
@@ -132,13 +132,16 @@ public void onEnable() {
             }
         });
 
-        if (hooked)
+        if (hooked || getSettings().isAllowInOtherWorlds())
         {
             // Start warp signs
             warpSignsManager = new WarpSignsManager(this, this.getPlugin());
             warpPanelManager = new WarpPanelManager(this);
             // Load the listener
             this.registerListener(new WarpSignsListener(this));
+        } else {
+            logWarning("Addon did not hook into anything and is not running stand-alone");
+            this.setState(State.DISABLED);
         }
     }
 

diff --git a/src/main/java/world/bentobox/warps/commands/WarpsCommand.java b/src/main/java/world/bentobox/warps/commands/WarpsCommand.java
@@ -43,7 +43,10 @@ public void setup() {
     @Override
     public boolean execute(User user, String label, List<String> args) {
         World world = getWorld() == null ? user.getWorld() : getWorld();
-        if (addon.getWarpSignsManager().listWarps(world).isEmpty()) {
+        if (addon
+                .getWarpSignsManager()
+                .listWarps(world)
+                .isEmpty()) {
             user.sendMessage("warps.error.no-warps-yet");
             user.sendMessage("warps.warpTip", "[text]", addon.getSettings().getWelcomeLine());
             return false;