Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-01 00:10:40 +01:00
Code Issues Projects Releases Wiki Activity

Call the TeamSetownerEvent before making the change in AdminTeamSetownerCommand

Browse Source 
Fixes https://github.com/BentoBoxWorld/BentoBox/issues/1349
Also call one of the two "RankChange" event before the change (not doing the latter was a bug, actually).
This commit is contained in:
Florian CUNY 2020-05-13 16:17:06 +02:00
parent feab01cde8
commit 783a68a757
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,11 +55,7 @@ public class AdminTeamSetownerCommand extends CompositeCommand {
// Get the User corresponding to the current owner // Get the User corresponding to the current owner
User previousOwner = User.getInstance(previousOwnerUUID); User previousOwner = User.getInstance(previousOwnerUUID);
// Make new owner
User target = User.getInstance(targetUUID); User target = User.getInstance(targetUUID);
getIslands().setOwner(getWorld(), user, targetUUID);
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);
@ -72,6 +68,7 @@ public class AdminTeamSetownerCommand extends CompositeCommand {
.build(); .build();
// Call the rank change event for the new island owner // Call the rank change event for the new island owner
// We need to call it BEFORE the actual change, in order to retain the player's previous rank.
IslandEvent.builder() IslandEvent.builder()
.island(island) .island(island)
.involvedPlayer(targetUUID) .involvedPlayer(targetUUID)
@ -80,7 +77,12 @@ public class AdminTeamSetownerCommand extends CompositeCommand {
.rankChange(island.getRank(target), RanksManager.OWNER_RANK) .rankChange(island.getRank(target), RanksManager.OWNER_RANK)
.build(); .build();
// Make new owner
getIslands().setOwner(getWorld(), user, targetUUID);
user.sendMessage("commands.admin.team.setowner.success", TextVariables.NAME, args.get(0));
// Call the rank change event for the old island owner // Call the rank change event for the old island owner
// We need to call it AFTER the actual change.
IslandEvent.builder() IslandEvent.builder()
.island(island) .island(island)
.involvedPlayer(previousOwnerUUID) .involvedPlayer(previousOwnerUUID)
@ -88,6 +90,7 @@ public class AdminTeamSetownerCommand extends CompositeCommand {
.reason(IslandEvent.Reason.RANK_CHANGE) .reason(IslandEvent.Reason.RANK_CHANGE)
.rankChange(RanksManager.OWNER_RANK, island.getRank(previousOwner)) .rankChange(RanksManager.OWNER_RANK, island.getRank(previousOwner))
.build(); .build();
return true; return true;
} }
} }