Fixes skygrid go command not unknown players.

#26
BentoBoxWorld · Aug 29, 2019 · f73b94d · f73b94d
1 parent 4ca43cd
commit f73b94d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/src/main/java/world/bentobox/skygrid/Settings.java b/src/main/java/world/bentobox/skygrid/Settings.java
@@ -1003,7 +1003,7 @@ public boolean isEndIslands() {
 
     @Override
     public boolean isNetherIslands() {
-        return false;
+        return true;
     }
 
     @Override

diff --git a/src/main/java/world/bentobox/skygrid/commands/GoCommand.java b/src/main/java/world/bentobox/skygrid/commands/GoCommand.java
@@ -5,15 +5,16 @@
 import org.apache.commons.lang.math.NumberUtils;
 
 import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.commands.DelayedTeleportCommand;
 import world.bentobox.bentobox.api.commands.island.CustomIslandMultiHomeHelp;
-import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.lists.Flags;
 
 /**
  * @author tastybento
  */
-public class GoCommand extends CompositeCommand {
+public class GoCommand extends DelayedTeleportCommand {
 
     public GoCommand(CompositeCommand islandCommand) {
         super(islandCommand, "go");
@@ -28,23 +29,33 @@ public void setup() {
     }
 
     @Override
-    public boolean execute(User user, String label, List<String> args) {
+    public boolean canExecute(User user, String label, List<String> args) {
+        // Check if the island is reserved
+        Island island = getIslands().getIsland(getWorld(), user.getUniqueId());
+        if (island == null) {
+            user.sendMessage("general.errors.no-island");
+            return false;
+        }
         if ((getIWM().inWorld(user.getWorld()) && Flags.PREVENT_TELEPORT_WHEN_FALLING.isSetForWorld(user.getWorld()))
                 && user.getPlayer().getFallDistance() > 0) {
             // We're sending the "hint" to the player to tell them they cannot teleport while falling.
             user.sendMessage(Flags.PREVENT_TELEPORT_WHEN_FALLING.getHintReference());
-            return true;
+            return false;
         }
+        return true;
+    }
+
+    @Override
+    public boolean execute(User user, String label, List<String> args) {
         if (!args.isEmpty() && NumberUtils.isDigits(args.get(0))) {
             int homeValue = Integer.parseInt(args.get(0));
             int maxHomes = user.getPermissionValue(getPermissionPrefix() + "skygrid.maxhomes", getIWM().getMaxHomes(getWorld()));
             if (homeValue > 1 && homeValue <= maxHomes) {
-                getIslands().homeTeleport(getWorld(), user.getPlayer(), homeValue);
-                user.sendMessage("commands.skygrid.go.tip", TextVariables.LABEL, getTopLabel());
+                this.delayCommand(user, () -> getIslands().homeTeleport(getWorld(), user.getPlayer(), homeValue));
                 return true;
             }
         }
-        getIslands().homeTeleport(getWorld(), user.getPlayer());
+        this.delayCommand(user, () -> getIslands().homeTeleport(getWorld(), user.getPlayer()));
         return true;
     }