From 2ec17ae9aa613e6ba49fc332257a45639f099359 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 3 Sep 2023 20:48:28 +0100 Subject: [PATCH] Fix broken death messages --- .../minelittlepony/unicopia/mixin/MixinDamageSource.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/MixinDamageSource.java b/src/main/java/com/minelittlepony/unicopia/mixin/MixinDamageSource.java index 7da56dcd..082bb4f9 100644 --- a/src/main/java/com/minelittlepony/unicopia/mixin/MixinDamageSource.java +++ b/src/main/java/com/minelittlepony/unicopia/mixin/MixinDamageSource.java @@ -22,14 +22,16 @@ abstract class MixinDamageSource { Living.getOrEmpty(entity).map(Living::getAttacker).ifPresent(attacker -> { Entity prime = entity.getPrimeAdversary(); if (prime != null && !attacker.isOwnedBy(prime)) { - info.setReturnValue(Text.translatable("death.attack.generic.and_also", info.getReturnValue(), attacker.asEntity().getDisplayName())); + info.setReturnValue(Text.translatable("death.attack.unicopia.generic.and_also", info.getReturnValue(), attacker.asEntity().getDisplayName())); return; } - info.setReturnValue(Text.translatable("death.attack." + self.getName() + ".player", entity.getDisplayName(), attacker.asEntity().getDisplayName())); + String name = self.getName(); + if (!name.endsWith(".player")) { + info.setReturnValue(Text.translatable("death.attack." + name + ".player", entity.getDisplayName(), attacker.asEntity().getDisplayName())); + } }); - Pony.of(entity).filter(e -> e.getCompositeRace().canFly()).ifPresent(pony -> { if (pony.getPhysics().isFlying()) { info.setReturnValue(Text.translatable("death.attack.unicopia.generic.whilst_flying", info.getReturnValue()));