2309 admin setowner

src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamSetownerCommand.java

@@ -1,9 +1,17 @@
 package world.bentobox.bentobox.api.commands.admin.team;
 
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.UUID;
 
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.eclipse.jdt.annotation.Nullable;
+
+import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.commands.ConfirmableCommand;
 import world.bentobox.bentobox.api.events.island.IslandEvent;
 import world.bentobox.bentobox.api.events.team.TeamEvent;
 import world.bentobox.bentobox.api.localization.TextVariables;
@@ -17,7 +25,11 @@
  * 
  * @author tastybento
  */
-public class AdminTeamSetownerCommand extends CompositeCommand {
+public class AdminTeamSetownerCommand extends ConfirmableCommand {
+
+    private @Nullable UUID targetUUID;
+    private Island island;
+    private @Nullable UUID previousOwnerUUID;
 
     public AdminTeamSetownerCommand(CompositeCommand parent) {
         super(parent, "setowner");
@@ -28,35 +40,50 @@ public void setup() {
         setPermission("mod.team.setowner");
         setParametersHelp("commands.admin.team.setowner.parameters");
         setDescription("commands.admin.team.setowner.description");
+        this.setOnlyPlayer(true);
     }
 
     @Override
-    public boolean execute(User user, String label, List<String> args) {
+    public boolean canExecute(User user, String label, List<String> args) {
         // If args are not right, show help
         if (args.size() != 1) {
             showHelp(this, user);
             return false;
         }
+
         // Get target
-        UUID targetUUID = Util.getUUID(args.get(0));
+        targetUUID = Util.getUUID(args.get(0));
         if (targetUUID == null) {
             user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
             return false;
         }
-        if (!getIslands().inTeam(getWorld(), targetUUID)) {
-            user.sendMessage("general.errors.not-in-team");
+        // Check that user is on an island
+        Optional<Island> opIsland = getIslands().getIslandAt(user.getLocation());
+        if (opIsland.isEmpty()) {
+            user.sendMessage("commands.admin.team.setowner.must-be-on-island");
             return false;
         }
-        Island island = getIslands().getPrimaryIsland(getWorld(), targetUUID);
-        UUID previousOwnerUUID = island.getOwner();
+        island = opIsland.get();
+        previousOwnerUUID = island.getOwner();
         if (targetUUID.equals(previousOwnerUUID)) {
             user.sendMessage("commands.admin.team.setowner.already-owner", TextVariables.NAME, args.get(0));
             return false;
         }
+        return true;
+    }
 
-        // Get the User corresponding to the current owner
-        User target = User.getInstance(targetUUID);
+    public boolean execute(User user, String label, List<String> args) {
+        Objects.requireNonNull(island);
+        Objects.requireNonNull(targetUUID);
+
+        this.askConfirmation(user, user.getTranslation("commands.admin.team.setowner.confirmation", TextVariables.NAME,
+                args.get(0), TextVariables.XYZ, Util.xyz(island.getCenter().toVector())), () -> changeOwner(user));
+        return true;
 
+    }
+
+    protected void changeOwner(User user) {
+        User target = User.getInstance(targetUUID);
         // Fire event so add-ons know
         // Call the setowner event
         TeamEvent.builder().island(island).reason(TeamEvent.Reason.SETOWNER).involvedPlayer(targetUUID).admin(true)
@@ -70,8 +97,20 @@ public boolean execute(User user, String label, List<String> args) {
                 .build();
 
         // Make new owner
-        getIslands().setOwner(getWorld(), user, targetUUID);
-        user.sendMessage("commands.admin.team.setowner.success", TextVariables.NAME, args.get(0));
+        getIslands().setOwner(user, targetUUID, island, RanksManager.MEMBER_RANK);
+        user.sendMessage("commands.admin.team.setowner.success", TextVariables.NAME, target.getName());
+
+        // Report if this made player have more islands than expected
+        // Get how many islands this player has
+        int num = this.getIslands().getNumberOfConcurrentIslands(targetUUID, getWorld());
+        int max = target.getPermissionValue(
+                this.getIWM().getAddon(getWorld()).map(GameModeAddon::getPermissionPrefix).orElse("") + "island.number",
+                this.getIWM().getWorldSettings(getWorld()).getConcurrentIslands());
+        if (num > max) {
+            // You cannot make an island
+            user.sendMessage("commands.admin.team.setowner.extra-islands", TextVariables.NUMBER, String.valueOf(num),
+                    "[max]", String.valueOf(max));
+        }
 
         // Call the rank change event for the old island owner
         if (previousOwnerUUID != null) {
@@ -80,6 +119,13 @@ public boolean execute(User user, String label, List<String> args) {
                     .reason(IslandEvent.Reason.RANK_CHANGE)
                     .rankChange(RanksManager.OWNER_RANK, island.getRank(previousOwnerUUID)).build();
         }
-        return true;
+
+    }
+
+    @Override
+    public Optional<List<String>> tabComplete(User user, String alias, List<String> args) {
+        String lastArg = !args.isEmpty() ? args.get(args.size() - 1) : "";
+        List<String> options = Bukkit.getOnlinePlayers().stream().map(Player::getName).toList();
+        return Optional.of(Util.tabLimit(options, lastArg));
     }
 }

src/main/java/world/bentobox/bentobox/managers/IslandsManager.java

@@ -1520,17 +1520,22 @@ public void setOwner(World world, User user, UUID targetUUID) {
     /**
      * Sets this target as the owner for this island
      * 
-     * @param user       previous owner
+     * @param user       user making the change
      * @param targetUUID new owner
      * @param island     island to register
      * @param rank      rank to which to set old owner.
      */
     public void setOwner(User user, UUID targetUUID, Island island, int rank) {
-        islandCache.setOwner(island, targetUUID);
-        // Set old owner as sub-owner on island.
-        if (rank > RanksManager.VISITOR_RANK) {
-            island.setRank(user, rank);
+        // Demote the old owner
+        if (rank >= RanksManager.OWNER_RANK) {
+            plugin.logWarning("Setowner: previous owner's rank cannot be higher than SubOwner");
+            rank = RanksManager.SUB_OWNER_RANK;
+        }
+        if (rank > RanksManager.VISITOR_RANK && island.getOwner() != null) {
+            island.setRank(island.getOwner(), rank);
         }
+        // Make the new owner
+        islandCache.setOwner(island, targetUUID);
 
         user.sendMessage("commands.island.team.setowner.name-is-the-owner", "[name]",
                 plugin.getPlayers().getName(targetUUID));

src/main/java/world/bentobox/bentobox/managers/island/IslandCache.java

@@ -18,6 +18,7 @@
 import world.bentobox.bentobox.BentoBox;
 import world.bentobox.bentobox.api.flags.Flag;
 import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.managers.RanksManager;
 import world.bentobox.bentobox.util.Util;
 
 /**
@@ -353,6 +354,7 @@ public void setOwner(@NonNull Island island, @Nullable UUID newOwnerUUID) {
         if (newOwnerUUID != null) {
             islandsByUUID.computeIfAbsent(newOwnerUUID, k -> new HashSet<>()).add(island);
         }
+        island.setRank(newOwnerUUID, RanksManager.OWNER_RANK);
         islandsByLocation.put(island.getCenter(), island);
         islandsById.put(island.getUniqueId(), island);
     }

src/main/resources/locales/en-US.yml

@@ -144,7 +144,10 @@ commands:
         parameters: <player>
         description: transfers island ownership to the player
         already-owner: '&c [name] is already the owner of this island!'
+        must-be-on-island: '&c You must be on the island to set the owner'
+        confirmation: '&a Are you sure you want to set [name] to be the owner of the island at [xyz]?'
         success: '&b [name]&a  is now the owner of this island.'
+        extra-islands: '&c Warning: this player now owns [number] islands. This is more than allowed by settings or perms: [max].'
     range:
       description: admin island range command
       invalid-value: