Octol1ttle/knockdowns
1
1
Fork 0
Code Issues Pull requests Releases Activity

Compare commits

base: Octol1ttle:de9d1306fe7619a495da71986a8ecbd2b0cfa4a3
Branches Tags
Octol1ttle:master
Octol1ttle:1.19.x
..
compare: Octol1ttle:cbe7c959f733c0648268cb8597df389616396cc6
Branches Tags
Octol1ttle:master
Octol1ttle:1.19.x

3 commits
de9d1306fe ... cbe7c959f7

Author SHA1 Message Date
Octol1ttle
cbe7c959f7
1.19.2 2024-03-03 16:50:04 +05:00
Octol1ttle
4e02f61903
fix: correctly determine when to send death message instead of knockdown message 2024-03-03 16:46:56 +05:00
Octol1ttle
3b499b9f5c
fix: check if teammate is dead instead of downed player 2024-03-03 16:42:31 +05:00
3 changed files with 7 additions and 8 deletions
Show stats Expand all files Collapse all files

2
common/src/main/java/ru/octol1ttle/knockdowns/common/KnockdownsUtils.java
View file

@ -16,7 +16,7 @@ public class KnockdownsUtils {
continue; continue;
} }
IKnockableDown knockable = (IKnockableDown) teammate; IKnockableDown knockable = (IKnockableDown) teammate;
if (!knockable.is_KnockedDown() && !player.isDead()) { if (!knockable.is_KnockedDown() && !teammate.isDead()) {
return false; return false;
} }
} }

11
common/src/main/java/ru/octol1ttle/knockdowns/common/events/KnockdownsEvents.java
View file

@ -70,13 +70,12 @@ public class KnockdownsEvents {
KnockdownsNetwork.sendToWorld(player.getWorld(), new PlayKnockedDownSoundS2CPacket(player.getX(), player.getY(), player.getZ())); KnockdownsNetwork.sendToWorld(player.getWorld(), new PlayKnockedDownSoundS2CPacket(player.getX(), player.getY(), player.getZ()));
Text deathMessage = entity.getDamageTracker().getDeathMessage(); Text deathMessage = entity.getDamageTracker().getDeathMessage();
TranslatableTextContent content = (TranslatableTextContent) deathMessage.getContent(); TranslatableTextContent deathContent = (TranslatableTextContent) deathMessage.getContent();
Text replaced = Text.translatable(content.getKey().replace("death.", "knockdown."), content.getArgs());
if (replaced.getString().equals(content.getKey())) {
replaced = deathMessage;
}
server.getPlayerManager().broadcast(replaced, false); String knockdownKey = deathContent.getKey().replace("death.", "knockdown.");
Text knockdownMessage = Text.translatable(knockdownKey, deathContent.getArgs());
server.getPlayerManager().broadcast(!knockdownMessage.getString().equals(knockdownKey) ? knockdownMessage : deathMessage, false);
return EventResult.interruptFalse(); return EventResult.interruptFalse();
}); });

2
gradle.properties
View file

@ -4,7 +4,7 @@ minecraft_version=1.19.2
enabled_platforms=fabric,forge enabled_platforms=fabric,forge
archives_base_name=knockdowns archives_base_name=knockdowns
mod_version=2.1.0 mod_version=2.1.1
maven_group=ru.octol1ttle.knockdowns maven_group=ru.octol1ttle.knockdowns
architectury_version=6.5.85 architectury_version=6.5.85