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 players being 'dead' even with half heart

Browse source
This commit is contained in:
Camotoy 2021-07-08 20:21:21 -04:00
parent 92cd36d81f
commit 334e4fb059
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
connector/src/main/java/org/geysermc/connector/entity/living/monster/EnderDragonEntity.java
View file

@ -110,7 +110,7 @@ public class EnderDragonEntity extends InsentientEntity implements Tickable {
@Override @Override
protected AttributeData createHealthAttribute() { protected AttributeData createHealthAttribute() {
// Round health up, so that Bedrock doesn't consider the dragon to be dead when health is between 0 and 1 // Round health up, so that Bedrock doesn't consider the dragon to be dead when health is between 0 and 1
return GeyserAttributeType.HEALTH.getAttribute((float) Math.ceil(this.health), this.maxHealth); return new AttributeData(GeyserAttributeType.HEALTH.getBedrockIdentifier(), 0f, this.maxHealth, (float) Math.ceil(this.health), this.maxHealth);
} }
@Override @Override

8
connector/src/main/java/org/geysermc/connector/entity/player/PlayerEntity.java
View file

@ -46,6 +46,7 @@ import lombok.Setter;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import org.geysermc.connector.entity.Entity; import org.geysermc.connector.entity.Entity;
import org.geysermc.connector.entity.LivingEntity; import org.geysermc.connector.entity.LivingEntity;
import org.geysermc.connector.entity.attribute.GeyserAttributeType;
import org.geysermc.connector.entity.living.animal.tameable.ParrotEntity; import org.geysermc.connector.entity.living.animal.tameable.ParrotEntity;
import org.geysermc.connector.entity.type.EntityType; import org.geysermc.connector.entity.type.EntityType;
import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.session.GeyserSession;
@ -244,6 +245,13 @@ public class PlayerEntity extends LivingEntity {
this.position = includeOffset ? position.add(0, entityType.getOffset(), 0) : position; this.position = includeOffset ? position.add(0, entityType.getOffset(), 0) : position;
} }
@Override
protected AttributeData createHealthAttribute() {
// Round health up, so that Bedrock doesn't consider the player to be dead when health is between 0 and 1 (half a heart)
// This issue, as of Bedrock 1.17.0, does not appear to persist with any other entity except the ender dragon
return new AttributeData(GeyserAttributeType.HEALTH.getBedrockIdentifier(), 0f, this.maxHealth, (float) Math.ceil(this.health), this.maxHealth);
}
@Override @Override
public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) { public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
super.updateBedrockMetadata(entityMetadata, session); super.updateBedrockMetadata(entityMetadata, session);