From 1df7f4fa402ffe38c84f83bd102d58668db173ed Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 10 Oct 2020 19:15:04 +0200 Subject: [PATCH] Fixed crash when disguised as the eye of ender (it dies immediately) --- .../minelittlepony/unicopia/entity/behaviour/Disguise.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/minelittlepony/unicopia/entity/behaviour/Disguise.java b/src/main/java/com/minelittlepony/unicopia/entity/behaviour/Disguise.java index 825f6e84..6190e6d8 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/behaviour/Disguise.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/behaviour/Disguise.java @@ -319,6 +319,10 @@ public class Disguise implements NbtSerialisable { } private static void getCollissionShapes(Entity entity, ShapeContext context, Consumer output) { + if (entity == null) { + return; + } + if (entity.method_30948()) { output.accept(VoxelShapes.cuboid(entity.getBoundingBox())); } else if (entity instanceof FallingBlockEntity) {