Admin kick to kick from all teams

BentoBoxWorld/AOneBlock#406
BentoBoxWorld · Nov 17, 2024 · 50b5118 · 50b5118
1 parent 01eaea9
commit 50b5118
Showing 1 changed file with 18 additions and 25 deletions.
diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamKickCommand.java
@@ -59,35 +59,28 @@ public boolean canExecute(User user, String label, List<String> args) {
 
     @Override
     public boolean execute(User user, String label, @NonNull List<String> args) {
-        Island island = getIslands().getIsland(getWorld(), targetUUID);
-        if (island == null) {
+        List<Island> islands = getIslands().getIslands(getWorld(), targetUUID);
+        if (islands.isEmpty()) {
             return false;
         }
-        if (targetUUID.equals(island.getOwner())) {
-            user.sendMessage("commands.admin.team.kick.cannot-kick-owner");
-            new IslandInfo(island).showMembers(user);
-            return false;
-        }
-        User target = User.getInstance(targetUUID);
-        target.sendMessage("commands.admin.team.kick.admin-kicked");
+        islands.forEach(island -> {
+            if (!user.getUniqueId().equals(island.getOwner())) {
+                User target = User.getInstance(targetUUID);
+                target.sendMessage("commands.admin.team.kick.admin-kicked");
 
-        getIslands().removePlayer(island, targetUUID);
-        user.sendMessage("commands.admin.team.kick.success", TextVariables.NAME, target.getName(), "[owner]", getPlayers().getName(island.getOwner()));
+                getIslands().removePlayer(island, targetUUID);
+                user.sendMessage("commands.admin.team.kick.success", TextVariables.NAME, target.getName(), "[owner]",
+                        getPlayers().getName(island.getOwner()));
+                // Fire event so add-ons know
+                TeamEvent.builder().island(island).reason(TeamEvent.Reason.KICK).involvedPlayer(targetUUID).admin(true)
+                        .build();
+                IslandEvent.builder().island(island).involvedPlayer(targetUUID).admin(true)
+                        .reason(IslandEvent.Reason.RANK_CHANGE)
+                        .rankChange(island.getRank(target), RanksManager.VISITOR_RANK).build();
+            }
+        });
+        user.sendRawMessage("Player removed from all teams in this world");
 
-        // Fire event so add-ons know
-        TeamEvent.builder()
-        .island(island)
-        .reason(TeamEvent.Reason.KICK)
-        .involvedPlayer(targetUUID)
-        .admin(true)
-        .build();
-        IslandEvent.builder()
-        .island(island)
-        .involvedPlayer(targetUUID)
-        .admin(true)
-        .reason(IslandEvent.Reason.RANK_CHANGE)
-        .rankChange(island.getRank(target), RanksManager.VISITOR_RANK)
-        .build();
         return true;
     }
 }