From 382e6b0bf0709b1f5b33998913e4bec8ef4ccabb Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 22 Oct 2022 19:02:47 +0200 Subject: [PATCH] Fix crash with EntityEvent.LIVING_CHECK_SPAWN on Forge (#345) * Fix crash with EntityEvent.LIVING_CHECK_SPAWN on Forge * Fix whitespace Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com> Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com> --- .../architectury/event/forge/EventHandlerImplCommon.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/forge/src/main/java/dev/architectury/event/forge/EventHandlerImplCommon.java b/forge/src/main/java/dev/architectury/event/forge/EventHandlerImplCommon.java index f0ded37f..52052178 100644 --- a/forge/src/main/java/dev/architectury/event/forge/EventHandlerImplCommon.java +++ b/forge/src/main/java/dev/architectury/event/forge/EventHandlerImplCommon.java @@ -272,10 +272,11 @@ public class EventHandlerImplCommon { public static void event(LivingSpawnEvent.CheckSpawn event) { EventResult result = EntityEvent.LIVING_CHECK_SPAWN.invoker().canSpawn(event.getEntityLiving(), event.getWorld(), event.getX(), event.getY(), event.getZ(), event.getSpawnReason(), event.getSpawner()); if (result.interruptsFurtherEvaluation()) { - if (result.value() != null) { - event.setResult(result.value() == Boolean.TRUE ? Event.Result.ALLOW : Event.Result.DENY); + if (result.isEmpty()) { + event.setResult(Event.Result.DEFAULT); + } else { + event.setResult(result.value() ? Event.Result.ALLOW : Event.Result.DENY); } - event.setCanceled(true); } }