GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Fix edge case in health code since 1.18.30

Browse source 
Fixes #2957
This commit is contained in:
Camotoy 2022-05-04 15:54:19 -04:00
parent 31a84ea302
commit 05e98c3a10
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/org/geysermc/geyser/entity/type/player/SessionPlayerEntity.java
View file

@ -134,6 +134,10 @@ public class SessionPlayerEntity extends PlayerEntity {
return maxHealth;
}
public float getHealth() {
return this.health;
}
public void setHealth(float health) {
this.health = health;
}

13
core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/player/JavaSetHealthTranslator.java
View file

@ -27,6 +27,7 @@ package org.geysermc.geyser.translator.protocol.java.entity.player;
import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.player.ClientboundSetHealthPacket;
import com.nukkitx.protocol.bedrock.data.AttributeData;
import com.nukkitx.protocol.bedrock.packet.RespawnPacket;
import com.nukkitx.protocol.bedrock.packet.UpdateAttributesPacket;
import org.geysermc.geyser.entity.attribute.GeyserAttributeType;
import org.geysermc.geyser.entity.type.player.SessionPlayerEntity;
@ -43,6 +44,18 @@ public class JavaSetHealthTranslator extends PacketTranslator<ClientboundSetHeal
public void translate(GeyserSession session, ClientboundSetHealthPacket packet) {
SessionPlayerEntity entity = session.getPlayerEntity();
float oldHealth = entity.getHealth();
if (oldHealth <= 0f && Math.ceil(packet.getHealth()) > 0f) {
// Needed as of 1.18.30 (tested with a totem of undying on SPIGOT 1.12.2
// This shouldn't be triggered on a proper respawn because JavaSetHealthTranslator sets the health back to 20
// https://github.com/GeyserMC/Geyser/issues/2957
RespawnPacket respawnPacket = new RespawnPacket();
respawnPacket.setRuntimeEntityId(0);
respawnPacket.setPosition(entity.getPosition());
respawnPacket.setState(RespawnPacket.State.SERVER_READY);
session.sendUpstreamPacket(respawnPacket);
}
entity.setHealth(packet.getHealth());
UpdateAttributesPacket attributesPacket = new UpdateAttributesPacket();