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

Merge pull request #2323 from BentoBoxWorld/team_fixes

Browse Source 
Fix promote and demote #2322
This commit is contained in:
tastybento 2024-03-14 21:13:21 -07:00 committed by GitHub
commit b45c842c2f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamPromoteCommand.java
View File

@ -15,6 +15,9 @@ import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.managers.RanksManager; import world.bentobox.bentobox.managers.RanksManager;
import world.bentobox.bentobox.util.Util; import world.bentobox.bentobox.util.Util;
/**
* Handle promotion and demotion
*/
public class IslandTeamPromoteCommand extends CompositeCommand { public class IslandTeamPromoteCommand extends CompositeCommand {
private User target; private User target;
@ -45,7 +48,7 @@ public class IslandTeamPromoteCommand extends CompositeCommand {
showHelp(this, user); showHelp(this, user);
return false; return false;
} }
// Check if the user has a team
if (!getIslands().inTeam(getWorld(), user.getUniqueId())) { if (!getIslands().inTeam(getWorld(), user.getUniqueId())) {
user.sendMessage("general.errors.no-team"); user.sendMessage("general.errors.no-team");
return false; return false;
@ -65,6 +68,11 @@ public class IslandTeamPromoteCommand extends CompositeCommand {
user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0)); user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
return false; return false;
} }
// Check that target is a member of this island
if (!island.getMemberSet().contains(target.getUniqueId())) {
user.sendMessage("commands.island.team.promote.errors.must-be-member");
return false;
}
// Check if the user is not trying to promote/ demote himself // Check if the user is not trying to promote/ demote himself
if (target.equals(user)) { if (target.equals(user)) {
if (this.getLabel().equals("promote")) { if (this.getLabel().equals("promote")) {
@ -100,7 +108,8 @@ public class IslandTeamPromoteCommand extends CompositeCommand {
if (this.getLabel().equals("promote")) { if (this.getLabel().equals("promote")) {
int nextRank = RanksManager.getInstance().getRankUpValue(currentRank); int nextRank = RanksManager.getInstance().getRankUpValue(currentRank);
// Stop short of owner // Stop short of owner
if (nextRank != RanksManager.OWNER_RANK && nextRank > currentRank) { if (nextRank < RanksManager.OWNER_RANK && currentRank >= RanksManager.MEMBER_RANK
&& nextRank > currentRank) {
island.setRank(target, nextRank); island.setRank(target, nextRank);
String rankName = user.getTranslation(RanksManager.getInstance().getRank(nextRank)); String rankName = user.getTranslation(RanksManager.getInstance().getRank(nextRank));
user.sendMessage("commands.island.team.promote.success", TextVariables.NAME, target.getName(), TextVariables.RANK, rankName, TextVariables.DISPLAY_NAME, target.getDisplayName()); user.sendMessage("commands.island.team.promote.success", TextVariables.NAME, target.getName(), TextVariables.RANK, rankName, TextVariables.DISPLAY_NAME, target.getDisplayName());

2
src/main/resources/locales/en-US.yml
View File

@ -786,6 +786,7 @@ commands:
errors: errors:
cant-demote-yourself: '&c You can''t demote yourself!' cant-demote-yourself: '&c You can''t demote yourself!'
cant-demote: '&c You can''t demote higher ranks!' cant-demote: '&c You can''t demote higher ranks!'
must-be-member: '&c Player must be an island member!'
failure: '&c Player cannot be demoted any further!' failure: '&c Player cannot be demoted any further!'
success: '&a Demoted [name] to [rank]' success: '&a Demoted [name] to [rank]'
promote: promote:
@ -794,6 +795,7 @@ commands:
errors: errors:
cant-promote-yourself: '&c You can''t promote yourself!' cant-promote-yourself: '&c You can''t promote yourself!'
cant-promote: '&c You can''t promote above your rank!' cant-promote: '&c You can''t promote above your rank!'
must-be-member: '&c Player must be an island member!'
failure: '&c Player cannot be promoted any further!' failure: '&c Player cannot be promoted any further!'
success: '&a Promoted [name] to [rank]' success: '&a Promoted [name] to [rank]'
setowner: setowner: