Skip to content

Commit 45f2dca

Browse files
committed
Fixes max team size checks.
Fixes #2034
1 parent 8276406 commit 45f2dca

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ private void acceptTeamInvite(User user, Invite invite) {
157157
user.sendMessage(INVALID_INVITE);
158158
return;
159159
}
160-
if (teamIsland.getMemberSet(RanksManager.MEMBER_RANK, true).size() > getIslands().getMaxMembers(teamIsland, RanksManager.MEMBER_RANK)) {
160+
if (teamIsland.getMemberSet(RanksManager.MEMBER_RANK, true).size() >= getIslands().getMaxMembers(teamIsland, RanksManager.MEMBER_RANK)) {
161161
user.sendMessage("commands.island.team.invite.errors.island-is-full");
162162
return;
163163
}

src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ public boolean canExecute(User user, String label, List<String> args) {
5151
Invite invite = itc.getInvite(playerUUID);
5252
String name = getPlayers().getName(playerUUID);
5353
switch (invite.getType()) {
54-
case COOP -> user.sendMessage("commands.island.team.invite.name-has-invited-you.coop", TextVariables.NAME, name);
55-
case TRUST -> user.sendMessage("commands.island.team.invite.name-has-invited-you.trust", TextVariables.NAME, name);
56-
default -> user.sendMessage("commands.island.team.invite.name-has-invited-you", TextVariables.NAME, name);
54+
case COOP -> user.sendMessage("commands.island.team.invite.name-has-invited-you.coop", TextVariables.NAME, name);
55+
case TRUST -> user.sendMessage("commands.island.team.invite.name-has-invited-you.trust", TextVariables.NAME, name);
56+
default -> user.sendMessage("commands.island.team.invite.name-has-invited-you", TextVariables.NAME, name);
5757
}
5858
return true;
5959
}
@@ -69,7 +69,7 @@ public boolean canExecute(User user, String label, List<String> args) {
6969
return false;
7070
}
7171
// Check for space on team
72-
if (island.getMemberSet().size() > getIslands().getMaxMembers(island, RanksManager.MEMBER_RANK)) {
72+
if (island.getMemberSet().size() >= getIslands().getMaxMembers(island, RanksManager.MEMBER_RANK)) {
7373
user.sendMessage("commands.island.team.invite.errors.island-is-full");
7474
return false;
7575
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,8 @@ public Set<UUID> getMembers(@NonNull World world, @NonNull UUID playerUUID) {
490490
* Gets the maximum number of island members allowed on this island.
491491
* Will update the value based on world settings or island owner permissions (if online).
492492
* If the island is unowned, then this value will be 0.
493+
* The number given for MEMBER_RANK is meant to include this rank and higher, e.g. {@link RanksManager#SUB_OWNER_RANK}
494+
* and {@link RanksManager#OWNER_RANK}
493495
* @param island - island
494496
* @param rank {@link RanksManager#MEMBER_RANK}, {@link RanksManager#COOP_RANK}, or {@link RanksManager#TRUSTED_RANK}
495497
* @return max number of members. If negative, then this means unlimited.

0 commit comments

Comments
 (0)