From 70ec77b1e3a8c4a97a81692d8180f9b7c1ca92b5 Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Sun, 5 Dec 2021 19:07:51 -0500 Subject: [PATCH] Revert this particular change since it wasn't quite ready yet --- .../org/geysermc/geyser/entity/type/LivingEntity.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/LivingEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/LivingEntity.java index cd1a2ef3f..2aff7f9e1 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/type/LivingEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/LivingEntity.java @@ -255,13 +255,8 @@ public class LivingEntity extends Entity { if (javaAttribute.getType() instanceof AttributeType.Builtin type) { switch (type) { case GENERIC_MAX_HEALTH -> { - float maxHealth = (float) AttributeUtils.calculateValue(javaAttribute); - if (this.maxHealth != maxHealth) { - // Helps prnt respawn bugs where the player respawns twice - // Because we re-sent the health attribute as 0 - this.maxHealth = maxHealth; - newAttributes.add(createHealthAttribute()); - } + this.maxHealth = (float) AttributeUtils.calculateValue(javaAttribute); + newAttributes.add(createHealthAttribute()); } case GENERIC_ATTACK_DAMAGE -> newAttributes.add(calculateAttribute(javaAttribute, GeyserAttributeType.ATTACK_DAMAGE)); case GENERIC_FLYING_SPEED -> newAttributes.add(calculateAttribute(javaAttribute, GeyserAttributeType.FLYING_SPEED));