From fe7843b08abd0fbcd4bb5173c2a4f3f5b1e59c3c Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Fri, 17 Jul 2026 16:36:23 +0800 Subject: [PATCH] v1.4.1 --- .../terraria/effect/EffectLogicHandler.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java b/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java index 8d52327..4413d3d 100644 --- a/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java +++ b/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java @@ -24,7 +24,10 @@ public class EffectLogicHandler { public static void onEffectAdded(MobEffectEvent.Added event) { LivingEntity entity = event.getEntity(); MobEffectInstance instance = event.getEffectInstance(); - Holder currentEffect = instance.getEffect(); + Holder currentEffect = null; + if(instance != null) { + currentEffect = instance.getEffect(); + } if(checkEffect(currentEffect) && !entity.level().isClientSide() && !(entity instanceof Player)) { if(entity.level() instanceof ServerLevel serverLevel) { serverLevel.getChunkSource().broadcast(entity, @@ -37,7 +40,10 @@ public class EffectLogicHandler { public static void onEffectRemoved(MobEffectEvent.Remove event) { LivingEntity entity = event.getEntity(); MobEffectInstance instance = event.getEffectInstance(); - Holder currentEffect = instance.getEffect(); + Holder currentEffect = null; + if(instance != null) { + currentEffect = instance.getEffect(); + } if(checkEffect(currentEffect) && !entity.level().isClientSide() && !(entity instanceof Player)) { if(entity.level() instanceof ServerLevel serverLevel) { if(event.getEffectInstance() != null) { @@ -52,7 +58,10 @@ public class EffectLogicHandler { public static void onEffectExpired(MobEffectEvent.Expired event) { LivingEntity entity = event.getEntity(); MobEffectInstance instance = event.getEffectInstance(); - Holder currentEffect = instance.getEffect(); + Holder currentEffect = null; + if(instance != null) { + currentEffect = instance.getEffect(); + } if(checkEffect(currentEffect) && !entity.level().isClientSide() && !(entity instanceof Player)) { if(entity.level() instanceof ServerLevel serverLevel) { if(event.getEffectInstance() != null) {