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

kill immediately if no players and reset data when knocked dies

Browse source
This commit is contained in:
Octol1ttle 2024-01-19 21:00:50 +05:00
parent a13706f240
commit 81879b6ec4
Signed by: Octol1ttle
GPG key ID: B77C34313AEE1FFF
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,11 +31,23 @@ public class KnockdownsEvents {
private static void registerOnLivingDeath() { private static void registerOnLivingDeath() {
EntityEvent.LIVING_DEATH.register((entity, source) -> { EntityEvent.LIVING_DEATH.register((entity, source) -> {
if (entity.getWorld().isClient() || !(entity instanceof IKnockableDown knockable) || knockable.is_KnockedDown()) { if (entity.getWorld().isClient() || !(entity instanceof IKnockableDown knockable)) {
return EventResult.pass(); return EventResult.pass();
} }
ServerPlayerEntity serverPlayer = (ServerPlayerEntity) entity; ServerPlayerEntity serverPlayer = (ServerPlayerEntity) entity;
MinecraftServer server = serverPlayer.getServer();
if (server == null || server.getCurrentPlayerCount() == 1) {
return EventResult.pass();
}
if (knockable.is_KnockedDown()) {
knockable.set_KnockedDown(false);
knockable.set_ReviverCount(0);
knockable.set_ReviveTimer(KnockdownsCommon.REVIVE_WAIT_TIME);
return EventResult.pass();
}
entity.clearStatusEffects(); entity.clearStatusEffects();
entity.setInvulnerable(true); entity.setInvulnerable(true);
@ -53,10 +65,8 @@ public class KnockdownsEvents {
TranslatableTextContent content = (TranslatableTextContent) entity.getDamageTracker().getDeathMessage().getContent(); TranslatableTextContent content = (TranslatableTextContent) entity.getDamageTracker().getDeathMessage().getContent();
Text replaced = Text.translatableWithFallback(content.getKey().replace("death.", "knockdown."), content.getKey(), content.getArgs()); Text replaced = Text.translatableWithFallback(content.getKey().replace("death.", "knockdown."), content.getKey(), content.getArgs());
MinecraftServer server = serverPlayer.getServer();
if (server != null) {
server.getPlayerManager().broadcast(replaced, false); server.getPlayerManager().broadcast(replaced, false);
}
return EventResult.interruptFalse(); return EventResult.interruptFalse();
}); });