From 88244fe54b87a42a0e0abe01c8ef766c8500f57a Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Sat, 18 May 2024 23:58:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BB=E6=9D=80=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/net/mcreator/target/init/TargetModDamageTypes.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/net/mcreator/target/init/TargetModDamageTypes.java b/src/main/java/net/mcreator/target/init/TargetModDamageTypes.java index 72ae11838..d161c6048 100644 --- a/src/main/java/net/mcreator/target/init/TargetModDamageTypes.java +++ b/src/main/java/net/mcreator/target/init/TargetModDamageTypes.java @@ -47,6 +47,8 @@ public class TargetModDamageTypes { Entity entity = this.getDirectEntity() == null ? this.getEntity() : this.getDirectEntity(); if (entity == null) { return Component.translatable("death.attack." + this.getMsgId(), pLivingEntity.getDisplayName()); + } else if (entity instanceof LivingEntity living && living.getMainHandItem().hasCustomHoverName()) { + return Component.translatable("death.attack." + this.getMsgId() + ".item", pLivingEntity.getDisplayName(), entity.getDisplayName(), living.getMainHandItem().getDisplayName()); } else { return Component.translatable("death.attack." + this.getMsgId() + ".entity", pLivingEntity.getDisplayName(), entity.getDisplayName()); }