Fixed AdminGetrankCommand for island members

Fixes BentoBoxWorld#485
barpec12 · Jan 28, 2019 · 8bcf4ae · 8bcf4ae
1 parent 98cf9d5
commit 8bcf4ae
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminGetrankCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminGetrankCommand.java
@@ -45,17 +45,18 @@ public boolean execute(User user, String label, List<String> args) {
             user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
             return false;
         }
-        if (!getIslands().hasIsland(getWorld(), targetUUID)) {
+        Island island = getIslands().getIsland(getWorld(), targetUUID);
+        if (island != null) {
+            // Get rank
+            RanksManager rm = getPlugin().getRanksManager();
+            User target = User.getInstance(targetUUID);
+            int currentRank = island.getRank(target);
+            user.sendMessage("commands.admin.getrank.rank-is", TextVariables.RANK, user.getTranslation(rm.getRank(currentRank)));
+            return true;
+        } else {
             user.sendMessage("general.errors.player-has-no-island");
             return false;
         }
-        // Get rank
-        RanksManager rm = getPlugin().getRanksManager();
-        User target = User.getInstance(targetUUID);
-        Island island = getIslands().getIsland(getWorld(), targetUUID);
-        int currentRank = island.getRank(target);
-        user.sendMessage("commands.admin.getrank.rank-is", TextVariables.RANK, user.getTranslation(rm.getRank(currentRank)));
-        return true;
     }
 
     @Override