From a99646bcd80d9af20928b4b298aed8e7bd91ce07 Mon Sep 17 00:00:00 2001 From: LZX <1820455493@qq.com> Date: Wed, 8 Jul 2026 22:34:42 +0800 Subject: [PATCH] v1.2.2 --- gradle.properties | 2 +- .../terraria/effect/EffectLogicHandler.java | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1fb6d95..17372d2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,7 +32,7 @@ mod_name=Lzxnone Terraria # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=All Rights Reserved # The mod version. See https://semver.org/ -mod_version=1.2.1 +mod_version=1.2.2 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java b/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java index 228c77a..7ef3117 100644 --- a/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java +++ b/src/main/java/com/lzxnone/terraria/effect/EffectLogicHandler.java @@ -12,6 +12,8 @@ import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.event.entity.living.MobEffectEvent; import net.neoforged.neoforge.event.tick.EntityTickEvent; +import java.util.Objects; + @EventBusSubscriber(modid = LzxnoneTerraria.MODID) public class EffectLogicHandler { @@ -31,8 +33,10 @@ public class EffectLogicHandler { LivingEntity entity = event.getEntity(); if(!entity.level().isClientSide() && !(entity instanceof Player)) { if(entity.level() instanceof ServerLevel serverLevel) { - serverLevel.getChunkSource().broadcast(entity, - new ClientboundRemoveMobEffectPacket(entity.getId(), event.getEffectInstance().getEffect())); + if(event.getEffectInstance() != null) { + serverLevel.getChunkSource().broadcast(entity, + new ClientboundRemoveMobEffectPacket(entity.getId(), event.getEffectInstance().getEffect())); + } } } } @@ -42,8 +46,10 @@ public class EffectLogicHandler { LivingEntity entity = event.getEntity(); if (!entity.level().isClientSide() && !(entity instanceof Player)) { if (entity.level() instanceof ServerLevel serverLevel) { - serverLevel.getChunkSource().broadcast(entity, - new ClientboundRemoveMobEffectPacket(entity.getId(), event.getEffectInstance().getEffect())); + if(event.getEffectInstance() != null) { + serverLevel.getChunkSource().broadcast(entity, + new ClientboundRemoveMobEffectPacket(entity.getId(), event.getEffectInstance().getEffect())); + } } } }