From 1f1bb9827bee49f1810ecf6f3ce2e29c7a53f9ba Mon Sep 17 00:00:00 2001 From: Cadiboo <37298044+Cadiboo@users.noreply.github.com> Date: Thu, 26 Oct 2023 20:14:29 +1100 Subject: [PATCH] Fix suffocation issue at the expense of performance --- .../io/github/cadiboo/nocubes/collision/CollisionHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/github/cadiboo/nocubes/collision/CollisionHandler.java b/src/main/java/io/github/cadiboo/nocubes/collision/CollisionHandler.java index 1fdda04b..dfd6e8ff 100644 --- a/src/main/java/io/github/cadiboo/nocubes/collision/CollisionHandler.java +++ b/src/main/java/io/github/cadiboo/nocubes/collision/CollisionHandler.java @@ -79,7 +79,7 @@ public static VoxelShape getCollisionShapeOrThrow(boolean canCollide, BlockState var entity = context.getEntity(); if (entity instanceof FallingBlockEntity || // Stop sand etc. breaking when it falls - (NoCubesConfig.Server.tempMobCollisionsDisabled && !(entity instanceof Player)) || + (entity != null && NoCubesConfig.Server.tempMobCollisionsDisabled && !(entity instanceof Player)) || // Stop grass path turning to dirt causing a crash from trying to turn an empty VoxelShape into an AABB (entity == null && reader.getBlockState(blockPos) != state) )