Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-06-30 08:24:53 +02:00
Code Issues Projects Releases Wiki Activity

Support for additional hearts in Player#damage

Browse Source
This commit is contained in:
Felix Cravic 2020-05-26 23:15:09 +02:00
parent e6f38e2773
commit 224a8a3b86
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/net/minestom/server/entity/LivingEntity.java
View File

@ -226,6 +226,22 @@ public abstract class LivingEntity extends Entity implements EquipmentHandler {
entityAnimationPacket.entityId = getEntityId();
entityAnimationPacket.animation = EntityAnimationPacket.Animation.TAKE_DAMAGE;
sendPacketToViewersAndSelf(entityAnimationPacket);
// Additional hearts support
if (this instanceof Player) {
Player player = (Player) this;
float additionalHearts = player.getAdditionalHearts();
if (additionalHearts > 0) {
if (damage > additionalHearts) {
damage -= additionalHearts;
player.setAdditionalHearts(0);
} else {
player.setAdditionalHearts(additionalHearts - damage);
damage = 0;
}
}
}
setHealth(getHealth() - damage);
// play damage sound

1
src/main/java/net/minestom/server/entity/Player.java
View File

@ -252,6 +252,7 @@ public class Player extends LivingEntity {
@Override
public boolean damage(DamageType type, float value) {
// Compute final heart based on health and additional hearts
boolean result = super.damage(type, value);
if (result) {
lastDamageSource = type;