Fixes a bug that removed old owner from island (#2218)

* Fixes a bug that removed old owner from island These changes fix a bug that was introduced by clearing the island cache from the old owner for 2.0 verison. This will set the previous owner as sub-owner on the island. * Fixes rank on event fired. Changes from Visitor to Sub owner rank * Update IslandsManager.java Removes line that removes player from cache. They should remain in the cache. --------- Co-authored-by: tastybento <[email protected]>
BentoBoxWorld · Oct 30, 2023 · 4200fe4 · 4200fe4
1 parent 4a6bf31
commit 4200fe4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommand.java b/...main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommand.java
@@ -95,7 +95,7 @@ public boolean execute(User user, String label, List<String> args) {
         .involvedPlayer(user.getUniqueId())
         .admin(false)
         .reason(IslandEvent.Reason.RANK_CHANGE)
-        .rankChange(RanksManager.OWNER_RANK, RanksManager.VISITOR_RANK)
+        .rankChange(RanksManager.OWNER_RANK, RanksManager.SUB_OWNER_RANK)
         .build();
         getIslands().save(island);
         return true;
@@ -107,4 +107,4 @@ public Optional<List<String>> tabComplete(User user, String alias, List<String>
         return Optional.of(Util.tabLimit(getIslands().getMembers(getWorld(), user.getUniqueId()).stream().map(getPlayers()::getName).toList(), lastArg));
     }
 
-}
+}
diff --git a/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java b/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
@@ -1520,8 +1520,8 @@ public void setOwner(World world, User user, UUID targetUUID) {
      */
     public void setOwner(User user, UUID targetUUID, Island island) {
         islandCache.setOwner(island, targetUUID);
-        // Remove the old owner from the island
-        plugin.getIslands().removePlayer(island, user.getUniqueId());
+        // Set old owner as sub-owner on island.
+        island.setRank(user, RanksManager.SUB_OWNER_RANK);
 
         user.sendMessage("commands.island.team.setowner.name-is-the-owner", "[name]", plugin.getPlayers().getName(targetUUID));
         plugin.getIWM().getAddon(island.getWorld()).ifPresent(addon -> {