Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-09-28 14:47:30 +02:00
Code Issues Projects Releases Wiki Activity

Call a RankChange event for the old island owner in Setowner commands

Browse Source 
Fixes https://github.com/BentoBoxWorld/BentoBox/issues/1342
This commit is contained in:
Florian CUNY 2020-05-09 11:39:17 +02:00
parent 937052d378
commit de124ab182
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,22 +46,32 @@ public class AdminTeamSetownerCommand extends CompositeCommand {
user.sendMessage("general.errors.not-in-team"); user.sendMessage("general.errors.not-in-team");
return false; return false;
} }
if (getIslands().getOwner(getWorld(), targetUUID).equals(targetUUID)) {
UUID previousOwnerUUID = getIslands().getOwner(getWorld(), targetUUID);
if (targetUUID.equals(previousOwnerUUID)) {
user.sendMessage("commands.admin.team.setowner.already-owner", TextVariables.NAME, args.get(0)); user.sendMessage("commands.admin.team.setowner.already-owner", TextVariables.NAME, args.get(0));
return false; return false;
} }
// Get the User corresponding to the current owner
User previousOwner = User.getInstance(previousOwnerUUID);
// Make new owner // Make new owner
User target = User.getInstance(targetUUID); User target = User.getInstance(targetUUID);
getIslands().setOwner(getWorld(), user, targetUUID); getIslands().setOwner(getWorld(), user, targetUUID);
user.sendMessage("commands.admin.team.setowner.success", TextVariables.NAME, args.get(0)); user.sendMessage("commands.admin.team.setowner.success", TextVariables.NAME, args.get(0));
// Fire event so add-ons know // Fire event so add-ons know
Island island = getIslands().getIsland(getWorld(), targetUUID); Island island = getIslands().getIsland(getWorld(), targetUUID);
// Call the setowner event
TeamEvent.builder() TeamEvent.builder()
.island(island) .island(island)
.reason(TeamEvent.Reason.SETOWNER) .reason(TeamEvent.Reason.SETOWNER)
.involvedPlayer(targetUUID) .involvedPlayer(targetUUID)
.admin(true) .admin(true)
.build(); .build();
// Call the rank change event for the new island owner
IslandEvent.builder() IslandEvent.builder()
.island(island) .island(island)
.involvedPlayer(targetUUID) .involvedPlayer(targetUUID)
@ -69,6 +79,15 @@ public class AdminTeamSetownerCommand extends CompositeCommand {
.reason(IslandEvent.Reason.RANK_CHANGE) .reason(IslandEvent.Reason.RANK_CHANGE)
.rankChange(island.getRank(target), RanksManager.OWNER_RANK) .rankChange(island.getRank(target), RanksManager.OWNER_RANK)
.build(); .build();
// Call the rank change event for the old island owner
IslandEvent.builder()
.island(island)
.involvedPlayer(previousOwnerUUID)
.admin(true)
.reason(IslandEvent.Reason.RANK_CHANGE)
.rankChange(RanksManager.OWNER_RANK, island.getRank(previousOwner))
.build();
return true; return true;
} }
} }

10
src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommand.java
View File

@ -73,6 +73,7 @@ public class IslandTeamSetownerCommand extends CompositeCommand {
return false; return false;
} }
getIslands().setOwner(getWorld(), user, targetUUID); getIslands().setOwner(getWorld(), user, targetUUID);
// Call the event for the new owner
IslandEvent.builder() IslandEvent.builder()
.island(island) .island(island)
.involvedPlayer(targetUUID) .involvedPlayer(targetUUID)
@ -80,11 +81,18 @@ public class IslandTeamSetownerCommand extends CompositeCommand {
.reason(IslandEvent.Reason.RANK_CHANGE) .reason(IslandEvent.Reason.RANK_CHANGE)
.rankChange(island.getRank(User.getInstance(targetUUID)), RanksManager.OWNER_RANK) .rankChange(island.getRank(User.getInstance(targetUUID)), RanksManager.OWNER_RANK)
.build(); .build();
// Call the event for the previous owner
IslandEvent.builder()
.island(island)
.involvedPlayer(playerUUID)
.admin(false)
.reason(IslandEvent.Reason.RANK_CHANGE)
.rankChange(RanksManager.OWNER_RANK, island.getRank(user))
.build();
getIslands().save(island); getIslands().save(island);
return true; return true;
} }
@Override @Override
public Optional<List<String>> tabComplete(User user, String alias, List<String> args) { public Optional<List<String>> tabComplete(User user, String alias, List<String> args) {
List<String> options = new ArrayList<>(); List<String> options = new ArrayList<>();