Upstream
/
bentobox
mirror of https://github.com/BentoBoxWorld/BentoBox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

WIP - needs work on team invites.

This commit is contained in:
tastybento 2024-03-29 20:26:07 -07:00
parent 2b19d43c85
commit 0e6a25d74b
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamAddCommand.java
View File

@ -54,7 +54,7 @@ public class AdminTeamAddCommand extends CompositeCommand {
new IslandInfo(island).showMembers(user); new IslandInfo(island).showMembers(user);
return false; return false;
} }
if (getIWM().getWorldSettings(getWorld()).isTeamMembersDropIsland() && island.inTeam(targetUUID)) { if (getIWM().getWorldSettings(getWorld()).isDisallowTeamMemberIslands() && island.inTeam(targetUUID)) {
user.sendMessage("commands.island.team.invite.errors.already-on-team"); user.sendMessage("commands.island.team.invite.errors.already-on-team");
return false; return false;
} }

2
src/main/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommand.java
View File

@ -51,7 +51,7 @@ public class IslandCreateCommand extends CompositeCommand {
} }
} }
// Check if this player is on a team in this world // Check if this player is on a team in this world
if (getIWM().getWorldSettings(getWorld()).isTeamMembersDropIsland() if (getIWM().getWorldSettings(getWorld()).isDisallowTeamMemberIslands()
&& getIslands().inTeam(getWorld(), user.getUniqueId()) && island != null && getIslands().inTeam(getWorld(), user.getUniqueId()) && island != null
&& !user.getUniqueId().equals(island.getOwner())) { && !user.getUniqueId().equals(island.getOwner())) {
// Team members who are not owners cannot make additional islands // Team members who are not owners cannot make additional islands

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

@ -61,7 +61,7 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand {
} }
// Check if player is already in a team // Check if player is already in a team
if (getIWM().getWorldSettings(getWorld()).isTeamMembersDropIsland() if (getIWM().getWorldSettings(getWorld()).isDisallowTeamMemberIslands()
&& getIslands().inTeam(getWorld(), playerUUID)) { && getIslands().inTeam(getWorld(), playerUUID)) {
user.sendMessage("commands.island.team.invite.errors.you-already-are-in-team"); user.sendMessage("commands.island.team.invite.errors.you-already-are-in-team");
return false; return false;
@ -82,8 +82,14 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand {
switch (invite.getType()) { switch (invite.getType()) {
case COOP -> askConfirmation(user, () -> acceptCoopInvite(user, invite)); case COOP -> askConfirmation(user, () -> acceptCoopInvite(user, invite));
case TRUST -> askConfirmation(user, () -> acceptTrustInvite(user, invite)); case TRUST -> askConfirmation(user, () -> acceptTrustInvite(user, invite));
default -> askConfirmation(user, user.getTranslation("commands.island.team.invite.accept.confirmation"), default -> {
if (getIWM().getWorldSettings(getWorld()).isDisallowTeamMemberIslands()) {
askConfirmation(user, user.getTranslation("commands.island.team.invite.accept.confirmation"),
() -> acceptTeamInvite(user, invite)); () -> acceptTeamInvite(user, invite));
} else {
acceptTeamInvite(user, invite);
}
}
} }
return true; return true;
} }
@ -156,7 +162,7 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand {
user.sendMessage("commands.island.team.invite.errors.island-is-full"); user.sendMessage("commands.island.team.invite.errors.island-is-full");
return; return;
} }
if (getIWM().getWorldSettings(getWorld()).isTeamMembersDropIsland()) { if (getIWM().getWorldSettings(getWorld()).isDisallowTeamMemberIslands()) {
// Remove the player's other islands // Remove the player's other islands
getIslands().removePlayer(getWorld(), user.getUniqueId()); getIslands().removePlayer(getWorld(), user.getUniqueId());
} }
@ -166,7 +172,7 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand {
getIslands().setJoinTeam(teamIsland, user.getUniqueId()); getIslands().setJoinTeam(teamIsland, user.getUniqueId());
// Move player to team's island // Move player to team's island
getIslands().homeTeleportAsync(getWorld(), user.getPlayer()).thenRun(() -> { getIslands().homeTeleportAsync(getWorld(), user.getPlayer()).thenRun(() -> {
if (getIWM().getWorldSettings(getWorld()).isTeamMembersDropIsland()) { if (getIWM().getWorldSettings(getWorld()).isDisallowTeamMemberIslands()) {
// Delete the old islands // Delete the old islands
islands.forEach(island -> getIslands().deleteIsland(island, true, user.getUniqueId())); islands.forEach(island -> getIslands().deleteIsland(island, true, user.getUniqueId()));
} }

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

@ -105,7 +105,7 @@ public class IslandTeamInviteCommand extends CompositeCommand {
} }
// Player cannot invite someone already on a team // Player cannot invite someone already on a team
if (getIWM().getWorldSettings(getWorld()).isTeamMembersDropIsland() if (getIWM().getWorldSettings(getWorld()).isDisallowTeamMemberIslands()
&& getIslands().inTeam(getWorld(), invitedPlayerUUID)) { && getIslands().inTeam(getWorld(), invitedPlayerUUID)) {
user.sendMessage("commands.island.team.invite.errors.already-on-team"); user.sendMessage("commands.island.team.invite.errors.already-on-team");
return false; return false;
@ -171,7 +171,7 @@ public class IslandTeamInviteCommand extends CompositeCommand {
// Send message to online player // Send message to online player
invitedPlayer.sendMessage("commands.island.team.invite.name-has-invited-you", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName()); invitedPlayer.sendMessage("commands.island.team.invite.name-has-invited-you", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName());
invitedPlayer.sendMessage("commands.island.team.invite.to-accept-or-reject", TextVariables.LABEL, getTopLabel()); invitedPlayer.sendMessage("commands.island.team.invite.to-accept-or-reject", TextVariables.LABEL, getTopLabel());
if (getIWM().getWorldSettings(getWorld()).isTeamMembersDropIsland() if (getIWM().getWorldSettings(getWorld()).isDisallowTeamMemberIslands()
&& getIslands().hasIsland(getWorld(), invitedPlayer.getUniqueId())) { && getIslands().hasIsland(getWorld(), invitedPlayer.getUniqueId())) {
invitedPlayer.sendMessage("commands.island.team.invite.you-will-lose-your-island"); invitedPlayer.sendMessage("commands.island.team.invite.you-will-lose-your-island");
} }

2
src/main/java/world/bentobox/bentobox/api/configuration/WorldSettings.java
View File

@ -649,7 +649,7 @@ public interface WorldSettings extends ConfigObject {
* Remove islands when players join a team and not allow players to have other islands if they are in a team. * Remove islands when players join a team and not allow players to have other islands if they are in a team.
* @return true or false * @return true or false
*/ */
default boolean isTeamMembersDropIsland() { default boolean isDisallowTeamMemberIslands() {
return true; return true;
} }
} }