From 0e2ae6840b738048b1edb955d22597ee27a57578 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 30 Dec 2021 18:02:29 -0800 Subject: [PATCH] Catches if an entity referenced was removed --- .../java/com/volmit/iris/engine/object/IrisEntitySpawn.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java b/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java index 97449f73e..0bfcad5e6 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java @@ -160,6 +160,10 @@ public class IrisEntitySpawn implements IRare { private Entity spawn100(Engine g, Location at, boolean ignoreSurfaces) { try { IrisEntity irisEntity = getRealEntity(g); + if(irisEntity == null){ + Iris.error(" An entity referenced is not properly referenced / not real"); + return null; + } if (!ignoreSurfaces && !irisEntity.getSurface().matches(at.clone().subtract(0, 1, 0).getBlock())) { return null; @@ -170,6 +174,7 @@ public class IrisEntitySpawn implements IRare { Iris.debug("Spawned " + C.DARK_AQUA + "Entity<" + getEntity() + "> " + C.GREEN + e.getType() + C.LIGHT_PURPLE + " @ " + C.GRAY + e.getLocation().getX() + ", " + e.getLocation().getY() + ", " + e.getLocation().getZ()); } + return e; } catch (Throwable e) { Iris.reportError(e);