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

Compare commits

base: Octol1ttle:4e02f61903bfedc512c5bd89a740e6afc6794e09
Branches Tags
Octol1ttle:master
Octol1ttle:1.19.x
..
compare: Octol1ttle:34ea071e5fc67cfa6030916a9927a1590661066b
Branches Tags
Octol1ttle:master
Octol1ttle:1.19.x

No commits in common. "4e02f61903bfedc512c5bd89a740e6afc6794e09" and "34ea071e5fc67cfa6030916a9927a1590661066b" have entirely different histories.
4e02f61903 ... 34ea071e5f

3 changed files with 5 additions and 7 deletions
Show stats Expand all files Collapse all files

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

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

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

@ -70,12 +70,10 @@ public class KnockdownsEvents {
KnockdownsNetwork.sendToWorld(player.getServerWorld(), new PlayKnockedDownSoundS2CPacket(player.getX(), player.getY(), player.getZ())); KnockdownsNetwork.sendToWorld(player.getServerWorld(), new PlayKnockedDownSoundS2CPacket(player.getX(), player.getY(), player.getZ()));
Text deathMessage = entity.getDamageTracker().getDeathMessage(); 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."); server.getPlayerManager().broadcast(replaced, false);
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.20.1
enabled_platforms=fabric,forge enabled_platforms=fabric,forge
archives_base_name=knockdowns archives_base_name=knockdowns
mod_version=2.1.1 mod_version=2.1.0
maven_group=ru.octol1ttle.knockdowns maven_group=ru.octol1ttle.knockdowns
architectury_version=9.1.12 architectury_version=9.1.12