From d46351b866439bfafb870a36c776c7b28e4b112c Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Sun, 12 Sep 2021 08:24:19 -0400 Subject: [PATCH] Remove feature streams from worldmgr --- .../com/volmit/iris/engine/IrisWorldManager.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java index 5705e3439..5809b8555 100644 --- a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java @@ -250,15 +250,10 @@ public class IrisWorldManager extends EngineAssignedWorldManager { IrisBiome biome = getEngine().getSurfaceBiome(c); IrisRegion region = getEngine().getRegion(c); //@builder - IrisEntitySpawn v = spawnRandomly(Stream.concat(Stream.concat( - getData().getSpawnerLoader() - .loadAll(getDimension().getEntitySpawners()) - .shuffleCopy(RNG.r).stream() - .filter(this::canSpawn), - getData().getSpawnerLoader().streamAll(getEngine().getMantle() - .forEachFeature(c).stream() - .flatMap((o) -> o.getFeature().getEntitySpawners().stream())) - .filter(this::canSpawn)) + IrisEntitySpawn v = spawnRandomly(Stream.concat(getData().getSpawnerLoader() + .loadAll(getDimension().getEntitySpawners()) + .shuffleCopy(RNG.r).stream() + .filter(this::canSpawn) .filter((i) -> i.isValid(biome)) .flatMap((i) -> stream(i, initial)), Stream.concat(getData().getSpawnerLoader()