Apple/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #173 from OnlyBMan/master (Fixes #172)

Browse source 
Fix baby armorstands showing even when invisible
This commit is contained in:
Redned 2020-02-15 20:40:32 -06:00 committed by GitHub
commit f1b2386685
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
connector/src/main/java/org/geysermc/connector/entity/Entity.java
View file

@ -182,7 +182,7 @@ public class Entity {
metadata.getFlags().setFlag(EntityFlag.GLIDING, (xd & 0x80) == 0x80); metadata.getFlags().setFlag(EntityFlag.GLIDING, (xd & 0x80) == 0x80);
// metadata.getFlags().setFlag(EntityFlag.INVISIBLE, (xd & 0x20) == 0x20); // metadata.getFlags().setFlag(EntityFlag.INVISIBLE, (xd & 0x20) == 0x20);
if ((xd & 0x20) == 0x20) if ((xd & 0x20) == 0x20)
metadata.put(EntityData.SCALE, 0.01f); metadata.put(EntityData.SCALE, 0.0f);
else else
metadata.put(EntityData.SCALE, scale); metadata.put(EntityData.SCALE, scale);
} }

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

@ -43,7 +43,7 @@ public class ArmorStandEntity extends LivingEntity {
public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) { public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
if (entityMetadata.getType() == MetadataType.BYTE) { if (entityMetadata.getType() == MetadataType.BYTE) {
byte xd = (byte) entityMetadata.getValue(); byte xd = (byte) entityMetadata.getValue();
if((xd & 0x01) == 0x01) { if((xd & 0x01) == 0x01 && !(metadata.get(EntityData.SCALE).equals(0.0f))) {
metadata.put(EntityData.SCALE, .55f); metadata.put(EntityData.SCALE, .55f);
} }
} }