Merge pull request #2495 from BentoBoxWorld/develop

Release 2.5.3 Bug Fix
BentoBoxWorld · Sep 1, 2024 · c503ae6 · c503ae6
2 parents 97d42e4 + b461569
commit c503ae6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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
@@ -150,7 +150,7 @@ public boolean isInvited(@NonNull UUID invitee) {
         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);

diff --git 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 Collection<Island> getIslands() {
      * @since 2.4.0
      */
     public Island loadIsland(String uniqueId) {
-        return handler.loadObject(uniqueId);
+        return handler.objectExists(uniqueId) ? handler.loadObject(uniqueId) : null;
     }
 
     /**