Fixes coop and trust invites when team invites are not allowed

If a member or sub-owner has coop or trust invite capability and not team invite rank, and confirm invites is on, then the invites were not working. Fixes #1452
BentoBoxWorld · Sep 4, 2021 · 23522a2 · 23522a2
1 parent 0f7ca6a
commit 23522a2
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/.../java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java b/.../java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java
@@ -50,16 +50,17 @@ public boolean canExecute(User user, String label, List<String> args) {
             user.sendMessage("commands.island.team.invite.errors.invalid-invite");
             return false;
         }
-        // Check rank to of inviter
-        Island island = getIslands().getIsland(getWorld(), prospectiveOwnerUUID);
-        String inviteUsage = getParent().getSubCommand("invite").map(CompositeCommand::getUsage).orElse("");
-        if (island == null || island.getRank(prospectiveOwnerUUID) < island.getRankCommand(inviteUsage)) {
-            user.sendMessage("commands.island.team.invite.errors.invalid-invite");
-            itc.removeInvite(playerUUID);
-            return false;
-        }
         Invite invite = itc.getInvite(playerUUID);
         if (invite.getType().equals(Type.TEAM)) {
+            // Check rank to of inviter
+            Island island = getIslands().getIsland(getWorld(), prospectiveOwnerUUID);
+            String inviteUsage = getParent().getSubCommand("invite").map(CompositeCommand::getUsage).orElse("");
+            if (island == null || island.getRank(prospectiveOwnerUUID) < island.getRankCommand(inviteUsage)) {
+                user.sendMessage("commands.island.team.invite.errors.invalid-invite");
+                itc.removeInvite(playerUUID);
+                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");
@@ -82,10 +83,10 @@ public boolean execute(User user, String label, List<String> args) {
         // Get the invite
         Invite invite = itc.getInvite(playerUUID);
         switch (invite.getType()) {
-            case COOP -> askConfirmation(user, () -> acceptCoopInvite(user, invite));
-            case TRUST -> askConfirmation(user, () -> acceptTrustInvite(user, invite));
-            default -> askConfirmation(user, user.getTranslation("commands.island.team.invite.accept.confirmation"),
-                    () -> acceptTeamInvite(user, invite));
+        case COOP -> askConfirmation(user, () -> acceptCoopInvite(user, invite));
+        case TRUST -> askConfirmation(user, () -> acceptTrustInvite(user, invite));
+        default -> askConfirmation(user, user.getTranslation("commands.island.team.invite.accept.confirmation"),
+                () -> acceptTeamInvite(user, invite));
         }
         return true;
     }