GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

Clean up and fix more armor stand inconsistencies (#1988)

This commit is contained in:
Camotoy 2021-02-27 12:19:30 -05:00 committed by GitHub
parent ae3f50a79c
commit e09f33c614
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
connector/src/main/java/org/geysermc/connector/entity/living/ArmorStandEntity.java
View File

@ -123,43 +123,38 @@ public class ArmorStandEntity extends LivingEntity {
isInvisible = (xd & 0x20) == 0x20; isInvisible = (xd & 0x20) == 0x20;
updateSecondEntityStatus(false); updateSecondEntityStatus(false);
} }
} else if (entityMetadata.getId() == 2 || entityMetadata.getId() == 3) { } else if (entityMetadata.getId() == 2) {
updateSecondEntityStatus(false); updateSecondEntityStatus(false);
} else if (entityMetadata.getId() == 14 && entityMetadata.getType() == MetadataType.BYTE) { } else if (entityMetadata.getId() == 14 && entityMetadata.getType() == MetadataType.BYTE) {
byte xd = (byte) entityMetadata.getValue(); byte xd = (byte) entityMetadata.getValue();
// isSmall // isSmall
boolean newIsSmall = (xd & 0x01) == 0x01; boolean newIsSmall = (xd & 0x01) == 0x01;
if ((newIsSmall != isSmall) && positionRequiresOffset) { if (newIsSmall != isSmall) {
// Fix new inconsistency with offset if (positionRequiresOffset) {
this.position = fixOffsetForSize(position, newIsSmall); // Fix new inconsistency with offset
positionUpdateRequired = true; this.position = fixOffsetForSize(position, newIsSmall);
} positionUpdateRequired = true;
isSmall = newIsSmall;
if (isSmall) {
float scale = metadata.getFloat(EntityData.SCALE);
if (scale != 0.55f && scale != 0.0f) {
metadata.put(EntityData.SCALE, 0.55f);
} }
if (metadata.getFloat(EntityData.BOUNDING_BOX_WIDTH) == 0.5f) { isSmall = newIsSmall;
metadata.put(EntityData.BOUNDING_BOX_WIDTH, 0.25f); if (!isMarker) {
metadata.put(EntityData.BOUNDING_BOX_HEIGHT, 0.9875f); toggleSmallStatus();
} }
} else if (metadata.getFloat(EntityData.BOUNDING_BOX_WIDTH) == 0.25f) {
metadata.put(EntityData.BOUNDING_BOX_WIDTH, entityType.getWidth());
metadata.put(EntityData.BOUNDING_BOX_HEIGHT, entityType.getHeight());
} }
// setMarker // setMarker
boolean oldIsMarker = isMarker; boolean oldIsMarker = isMarker;
isMarker = (xd & 0x10) == 0x10; isMarker = (xd & 0x10) == 0x10;
if (isMarker) {
metadata.put(EntityData.BOUNDING_BOX_WIDTH, 0.0f);
metadata.put(EntityData.BOUNDING_BOX_HEIGHT, 0.0f);
}
if (oldIsMarker != isMarker) { if (oldIsMarker != isMarker) {
if (isMarker) {
metadata.put(EntityData.BOUNDING_BOX_WIDTH, 0.0f);
metadata.put(EntityData.BOUNDING_BOX_HEIGHT, 0.0f);
metadata.put(EntityData.SCALE, 0f);
} else {
toggleSmallStatus();
}
updateSecondEntityStatus(false); updateSecondEntityStatus(false);
} }
} }
@ -226,6 +221,7 @@ public class ArmorStandEntity extends LivingEntity {
if (!primaryEntity) return; if (!primaryEntity) return;
if (!isInvisible || isMarker) { if (!isInvisible || isMarker) {
// It is either impossible to show armor, or the armor stand isn't invisible. We good. // It is either impossible to show armor, or the armor stand isn't invisible. We good.
metadata.getFlags().setFlag(EntityFlag.INVISIBLE, false);
updateOffsetRequirement(false); updateOffsetRequirement(false);
if (positionUpdateRequired) { if (positionUpdateRequired) {
positionUpdateRequired = false; positionUpdateRequired = false;
@ -306,6 +302,15 @@ public class ArmorStandEntity extends LivingEntity {
} }
} }
/**
* If this armor stand is not a marker, set its bounding box size and scale.
*/
private void toggleSmallStatus() {
metadata.put(EntityData.BOUNDING_BOX_WIDTH, isSmall ? 0.25f : entityType.getWidth());
metadata.put(EntityData.BOUNDING_BOX_HEIGHT, isSmall ? 0.9875f : entityType.getHeight());
metadata.put(EntityData.SCALE, isSmall ? 0.55f : 1f);
}
/** /**
* @return the selected position with the position offset applied. * @return the selected position with the position offset applied.
*/ */