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

Compare commits

base: Octol1ttle:13c8c95b3cf21960a315d1cc976c8bee157001b3
Branches Tags
Octol1ttle:master
Octol1ttle:1.19.x
..
compare: Octol1ttle:cbe7c959f733c0648268cb8597df389616396cc6
Branches Tags
Octol1ttle:master
Octol1ttle:1.19.x

1 commit
13c8c95b3c ... cbe7c959f7

Author SHA1 Message Date
Octol1ttle
cbe7c959f7
1.19.2 2024-03-03 16:50:04 +05:00
3 changed files with 21 additions and 12 deletions
Show stats Expand all files Collapse all files

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

@ -29,11 +29,4 @@ public class KnockdownsUtils {
player.damage(/*Objects.requireNonNullElse(recent, */DamageSource.GENERIC/*)*/, damage);
player.velocityModified = false;
}
public static void resetKnockedState(IKnockableDown knockable) {
knockable.set_KnockedDown(false);
knockable.set_ReviverCount(0);
knockable.set_ReviveTimer(KnockdownsCommon.REVIVE_WAIT_TIME);
knockable.set_KnockedAge(0);
}
}

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

@ -41,8 +41,15 @@ public class KnockdownsEvents {
ServerPlayerEntity player = (ServerPlayerEntity) entity;
if (knockable.is_KnockedDown() || KnockdownsUtils.allTeammatesKnocked(server, player)) {
KnockdownsUtils.resetKnockedState(knockable);
if (KnockdownsUtils.allTeammatesKnocked(server, player)) {
return EventResult.pass();
}
if (knockable.is_KnockedDown()) {
knockable.set_KnockedDown(false);
knockable.set_ReviverCount(0);
knockable.set_ReviveTimer(KnockdownsCommon.REVIVE_WAIT_TIME);
knockable.set_KnockedAge(0);
return EventResult.pass();
}
@ -94,11 +101,14 @@ public class KnockdownsEvents {
knockable.set_ReviveTimer(knockable.get_ReviveTimer() - knockable.get_ReviverCount());
if (knockable.get_ReviveTimer() <= 0) {
KnockdownsUtils.resetKnockedState(knockable);
knockable.set_KnockedDown(false);
knockable.set_ReviverCount(0);
knockable.set_ReviveTimer(KnockdownsCommon.REVIVE_WAIT_TIME);
knockable.set_KnockedAge(0);
player.setInvulnerable(false);
player.setGlowing(false);
player.setHealth(player.getMaxHealth() * 0.3f);
player.setHealth(6.0f);
}
return;
}
@ -132,6 +142,12 @@ public class KnockdownsEvents {
}
return CompoundEventResult.pass();
});
InteractionEvent.RIGHT_CLICK_BLOCK.register((player, hand, pos, direction) -> {
if (KnockdownsUtils.isKnockedOrReviving(player)) {
return EventResult.interruptFalse();
}
return EventResult.pass();
});
}
private static void registerOnEntityUse() {

2
gradle.properties
View file

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