Filter ungenerated chunks on volume streams

SpongePowered · Nov 1, 2023 · d035bb1 · d035bb1
1 parent 64b5d1f
commit d035bb1
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/main/java/org/spongepowered/common/world/volume/VolumeStreamUtils.java b/src/main/java/org/spongepowered/common/world/volume/VolumeStreamUtils.java
@@ -633,6 +633,7 @@ private static <R extends Volume, API, MC, Section, KeyReference> SpongeVolumeSt
         if (options.loadingStyle().immediateLoading()) {
             final Set<KeyReference> availableTileEntityPositions = new LinkedHashSet<>();
             sectionStream
+                .filter(Objects::nonNull)
                 .map(entityAccessor)
                 .forEach((map) -> map.forEach(entry -> entryConsumer.accept(entry, availableTileEntityPositions)));
             filteredPosStream = availableTileEntityPositions.stream();
@@ -641,6 +642,7 @@ private static <R extends Volume, API, MC, Section, KeyReference> SpongeVolumeSt
             // Since we're operating on the chunk positions, we generate the Stream of keys
             // for each position, which in turn generate their filtered lists on demand.
             filteredPosStream = sectionStream
+                .filter(Objects::nonNull)
                 .flatMap(chunk -> {
                     final Set<KeyReference> blockEntityPoses = new LinkedHashSet<>();
                     entityAccessor.apply(chunk)