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

Fixed accept command for non-team invites

Browse Source
This commit is contained in:
Gabriele C 2019-12-20 22:09:41 +01:00 committed by Florian CUNY
parent a9b8be0328
commit 263e439722
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,11 +44,6 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand {
user.sendMessage("commands.island.team.invite.errors.none-invited-you");
return false;
}
// Check if player is already in a team
if (getIslands().inTeam(getWorld(), playerUUID)) {
user.sendMessage("commands.island.team.invite.errors.you-already-are-in-team");
return false;
}
// Get the island owner
prospectiveOwnerUUID = itc.getInviter(playerUUID);
if (!getIslands().hasIsland(getWorld(), prospectiveOwnerUUID)) {
@ -58,6 +53,11 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand {
}
Invite invite = itc.getInvite(playerUUID);
if (invite.getType().equals(Type.TEAM)) {
// Check if player is already in a team
if (getIslands().inTeam(getWorld(), playerUUID)) {
user.sendMessage("commands.island.team.invite.errors.you-already-are-in-team");
return false;
}
// Fire event so add-ons can run commands, etc.
IslandBaseEvent event = TeamEvent.builder()
.island(getIslands().getIsland(getWorld(), prospectiveOwnerUUID))