Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-01-10 10:28:21 +01:00
Code Issues Projects Releases Wiki Activity

Fixes getOwner and getIslands to properly return islands in the world

Browse Source 
The world was not being used for the getOwner return so if a player had
an island in any world then it was returned. This caused an NPE if the
island was then requested by getIsland because it would not be there.
This commit is contained in:
tastybento 2023-10-07 10:30:16 -07:00
parent e6ccce4a27
commit 6d2f79881b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/world/bentobox/bentobox/managers/island/IslandCache.java
View File

@ -177,7 +177,7 @@ public class IslandCache {
if (w == null) {
return new HashSet<>();
}
return islandsByUUID.computeIfAbsent(uuid, k -> new HashSet<>()).stream().filter(i -> world.equals(i.getWorld())).collect(Collectors.toSet());
return islandsByUUID.computeIfAbsent(uuid, k -> new HashSet<>()).stream().filter(i -> w.equals(i.getWorld())).collect(Collectors.toSet());
}
/**
@ -252,7 +252,7 @@ public class IslandCache {
* Get the UUID of the owner of the island of the player, which may be their UUID
* @param world the world to check
* @param uuid the player's UUID
* @return island owner's UUID or null if there is no island
* @return island owner's UUID or null if there is no island owned by the player in this world
*/
@Nullable
public UUID getOwner(@NonNull World world, @NonNull UUID uuid) {
@ -261,7 +261,8 @@ public class IslandCache {
if (w == null || islands == null || islands.isEmpty()) {
return null;
}
return islands.iterator().next().getOwner(); // This assumes that all islands in this set have the same owner
// Find the island for this world
return islands.stream().filter(i -> w.equals(i.getWorld())).findFirst().map(Island::getOwner).orElse(null);
}
/**