Fixed Island#getLoadedChunks returning null chunks

BG-Software-LLC · Jul 9, 2022 · 66b8052 · 66b8052
1 parent 1b6988f
commit 66b8052
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/main/java/com/bgsoftware/superiorskyblock/island/SIsland.java b/src/main/java/com/bgsoftware/superiorskyblock/island/SIsland.java
@@ -898,6 +898,7 @@ public List<Chunk> getLoadedChunks(boolean onlyProtected, boolean noEmptyChunks)
     public List<Chunk> getLoadedChunks(World.Environment environment, boolean onlyProtected, boolean noEmptyChunks) {
         World world = getCenter(environment).getWorld();
         return new SequentialListBuilder<Chunk>()
+                .filter(Objects::nonNull)
                 .build(IslandUtils.getChunkCoords(this, world, onlyProtected, noEmptyChunks), plugin.getNMSChunks()::getChunkIfLoaded);
     }
 

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/nms/NMSChunks.java b/src/main/java/com/bgsoftware/superiorskyblock/nms/NMSChunks.java
@@ -8,6 +8,7 @@
 import org.bukkit.block.Biome;
 import org.bukkit.entity.Player;
 
+import javax.annotation.Nullable;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -26,6 +27,7 @@ public interface NMSChunks {
 
     void refreshLights(Chunk chunk, List<SchematicBlock> blockData);
 
+    @Nullable
     Chunk getChunkIfLoaded(ChunkPosition chunkPosition);
 
     void startTickingChunk(Island island, Chunk chunk, boolean stop);