From e87cd7e4d2f32c8d65b5d011a83a50779777ee31 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 31 Aug 2024 17:40:50 -0700 Subject: [PATCH 1/2] Fix team invites --- .../bentobox/api/commands/island/team/IslandTeamCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java index 0e9b55be8..839169e64 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java @@ -150,7 +150,7 @@ public class IslandTeamCommand extends CompositeCommand { if (handler.objectExists(invitee.toString())) { @Nullable TeamInvite invite = getInvite(invitee); - valid = getIslands().getIslandById(invite.getUniqueId()).map(island -> island.isOwned() // Still owned by someone + valid = getIslands().getIslandById(invite.getIslandID()).map(island -> island.isOwned() // Still owned by someone && !island.isDeleted() // Not deleted && island.getMemberSet().contains(invite.getInviter()) // the inviter is still a member of the island ).orElse(false); From 11259415cc52d6e228cbb736543f30f6f3b1af14 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 31 Aug 2024 17:41:01 -0700 Subject: [PATCH 2/2] Check for object existing before loading --- .../world/bentobox/bentobox/managers/island/IslandCache.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/world/bentobox/bentobox/managers/island/IslandCache.java b/src/main/java/world/bentobox/bentobox/managers/island/IslandCache.java index 72f40f519..b5f3f5413 100644 --- a/src/main/java/world/bentobox/bentobox/managers/island/IslandCache.java +++ b/src/main/java/world/bentobox/bentobox/managers/island/IslandCache.java @@ -301,7 +301,7 @@ public class IslandCache { * @since 2.4.0 */ public Island loadIsland(String uniqueId) { - return handler.loadObject(uniqueId); + return handler.objectExists(uniqueId) ? handler.loadObject(uniqueId) : null; } /**