From ce29dc98c36e7828695aa4473ad7f81b7e5cab17 Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Thu, 10 Apr 2025 21:01:06 +0200 Subject: [PATCH] fix spawn markers not being removed --- core/src/main/java/com/volmit/iris/engine/IrisWorldManager.java | 2 +- .../java/com/volmit/iris/engine/object/IrisEntitySpawn.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/volmit/iris/engine/IrisWorldManager.java b/core/src/main/java/com/volmit/iris/engine/IrisWorldManager.java index 08962e4af..28e48bd18 100644 --- a/core/src/main/java/com/volmit/iris/engine/IrisWorldManager.java +++ b/core/src/main/java/com/volmit/iris/engine/IrisWorldManager.java @@ -367,7 +367,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager { private void spawn(IrisPosition pos, IrisEntitySpawn i) { IrisSpawner ref = i.getReferenceSpawner(); - if (!ref.canSpawn(getEngine(), pos.getX() >> 4, pos.getZ())) + if (!ref.canSpawn(getEngine(), pos.getX() >> 4, pos.getZ() >> 4)) return; int s = i.spawn(getEngine(), pos, RNG.r); diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java b/core/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java index a507c342f..c93ffaade 100644 --- a/core/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java +++ b/core/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java @@ -117,7 +117,7 @@ public class IrisEntitySpawn implements IRare { if (spawns > 0) { if (referenceMarker != null) { - gen.getMantle().getMantle().remove(c.getX(), c.getY(), c.getZ(), MatterMarker.class); + gen.getMantle().getMantle().remove(c.getX(), c.getY() - gen.getWorld().minHeight(), c.getZ(), MatterMarker.class); } for (int id = 0; id < spawns; id++) {