DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

fix damage source

Browse Source
This commit is contained in:
DBotThePony 2024-08-10 01:37:17 +07:00
parent 1c23005573
commit d4806dfb2a
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/kotlin/ru/dbotthepony/mc/otm/registry/MatteryDamageSource.kt
View File

@ -1,6 +1,7 @@
package ru.dbotthepony.mc.otm.registry package ru.dbotthepony.mc.otm.registry
import net.minecraft.core.Holder import net.minecraft.core.Holder
import net.minecraft.core.component.DataComponents
import net.minecraft.network.chat.Component import net.minecraft.network.chat.Component
import net.minecraft.world.damagesource.DamageSource import net.minecraft.world.damagesource.DamageSource
import net.minecraft.world.damagesource.DamageType import net.minecraft.world.damagesource.DamageType
@ -22,14 +23,14 @@ class MatteryDamageSource(
override fun getLocalizedDeathMessage(victim: LivingEntity): Component { override fun getLocalizedDeathMessage(victim: LivingEntity): Component {
val itemStack = inflictor ?: (entity as? LivingEntity)?.mainHandItem ?: ItemStack.EMPTY val itemStack = inflictor ?: (entity as? LivingEntity)?.mainHandItem ?: ItemStack.EMPTY
if (!itemStack.isEmpty && itemStack.hasCustomHoverName()) { if (!itemStack.isEmpty && itemStack.has(DataComponents.CUSTOM_NAME)) {
return TranslatableComponent("death.attack.$msgId.player.item", victim.displayName, entity!!.displayName, itemStack.displayName) return TranslatableComponent("death.attack.$msgId.player.item", victim.displayName!!, entity!!.displayName!!, itemStack.displayName)
} }
if (entity != null) { 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!!)
} }
} }