diff --git a/common/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsUtils.java b/common/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsUtils.java index 6f6b651..8715bd8 100644 --- a/common/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsUtils.java +++ b/common/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsUtils.java @@ -15,7 +15,7 @@ public class KnockdownsUtils { continue; } IKnockableDown knockable = (IKnockableDown) teammate; - if (!knockable.is_KnockedDown() && !teammate.isDead()) { + if (!knockable.is_KnockedDown() && !player.isDead()) { return false; } } diff --git a/common/src/main/java/ru/octol1ttle/knockdowns/common/events/KnockdownsEvents.java b/common/src/main/java/ru/octol1ttle/knockdowns/common/events/KnockdownsEvents.java index 16a3e78..8f46b96 100644 --- a/common/src/main/java/ru/octol1ttle/knockdowns/common/events/KnockdownsEvents.java +++ b/common/src/main/java/ru/octol1ttle/knockdowns/common/events/KnockdownsEvents.java @@ -70,12 +70,10 @@ public class KnockdownsEvents { KnockdownsNetwork.sendToWorld(player.getServerWorld(), new PlayKnockedDownSoundS2CPacket(player.getX(), player.getY(), player.getZ())); Text deathMessage = entity.getDamageTracker().getDeathMessage(); - TranslatableTextContent deathContent = (TranslatableTextContent) deathMessage.getContent(); + TranslatableTextContent content = (TranslatableTextContent) deathMessage.getContent(); + Text replaced = Text.translatableWithFallback(content.getKey().replace("death.", "knockdown."), deathMessage.getString(), content.getArgs()); - String knockdownKey = deathContent.getKey().replace("death.", "knockdown."); - Text knockdownMessage = Text.translatable(knockdownKey, deathContent.getArgs()); - - server.getPlayerManager().broadcast(!knockdownMessage.getString().equals(knockdownKey) ? knockdownMessage : deathMessage, false); + server.getPlayerManager().broadcast(replaced, false); return EventResult.interruptFalse(); }); diff --git a/gradle.properties b/gradle.properties index df19e26..f07c82c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ minecraft_version=1.20.1 enabled_platforms=fabric,forge archives_base_name=knockdowns -mod_version=2.1.1 +mod_version=2.1.0 maven_group=ru.octol1ttle.knockdowns architectury_version=9.1.12