From d4806dfb2aa739994aebcfea8906142d389e15ee Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sat, 10 Aug 2024 01:37:17 +0700 Subject: [PATCH] fix damage source --- .../dbotthepony/mc/otm/registry/MatteryDamageSource.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MatteryDamageSource.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MatteryDamageSource.kt index 697463316..3e5f2e1d5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MatteryDamageSource.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MatteryDamageSource.kt @@ -1,6 +1,7 @@ package ru.dbotthepony.mc.otm.registry import net.minecraft.core.Holder +import net.minecraft.core.component.DataComponents import net.minecraft.network.chat.Component import net.minecraft.world.damagesource.DamageSource import net.minecraft.world.damagesource.DamageType @@ -22,14 +23,14 @@ class MatteryDamageSource( override fun getLocalizedDeathMessage(victim: LivingEntity): Component { val itemStack = inflictor ?: (entity as? LivingEntity)?.mainHandItem ?: ItemStack.EMPTY - if (!itemStack.isEmpty && itemStack.hasCustomHoverName()) { - return TranslatableComponent("death.attack.$msgId.player.item", victim.displayName, entity!!.displayName, itemStack.displayName) + if (!itemStack.isEmpty && itemStack.has(DataComponents.CUSTOM_NAME)) { + return TranslatableComponent("death.attack.$msgId.player.item", victim.displayName!!, entity!!.displayName!!, itemStack.displayName) } if (entity != null) { - return TranslatableComponent("death.attack.$msgId.player", victim.displayName, entity!!.displayName) + return TranslatableComponent("death.attack.$msgId.player", victim.displayName!!, entity!!.displayName!!) } - return TranslatableComponent("death.attack.$msgId", victim.displayName) + return TranslatableComponent("death.attack.$msgId", victim.displayName!!) } }