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 cats being larger than normal and implement resting (#2238)

Browse source 
* Use the correct scale for cats.

* Implement resting
This commit is contained in:
Dylan Ogle 2021-05-29 14:37:03 +01:00 • committed by GitHub
parent 08ba82a44e
commit d80c31f1c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
connector/src/main/java/org/geysermc/connector/entity/living/animal/tameable/CatEntity.java
View file

@ -49,7 +49,14 @@ public class CatEntity extends TameableEntity {
@Override @Override
public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) { public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
super.updateBedrockMetadata(entityMetadata, session); super.updateBedrockMetadata(entityMetadata, session);
if (entityMetadata.getId() == 16) { if (entityMetadata.getId() == 15) {
metadata.put(EntityData.SCALE, .8f);
boolean isBaby = (boolean) entityMetadata.getValue();
if (isBaby) {
metadata.put(EntityData.SCALE, .4f);
metadata.getFlags().setFlag(EntityFlag.BABY, true);
}
} else if (entityMetadata.getId() == 16) {
// Update collar color if tamed // Update collar color if tamed
if (metadata.getFlags().getFlag(EntityFlag.TAMED)) { if (metadata.getFlags().getFlag(EntityFlag.TAMED)) {
metadata.put(EntityData.COLOR, collarColor); metadata.put(EntityData.COLOR, collarColor);
@ -76,6 +83,9 @@ public class CatEntity extends TameableEntity {
} }
metadata.put(EntityData.VARIANT, variantColor); metadata.put(EntityData.VARIANT, variantColor);
} }
if (entityMetadata.getId() == 19) {
metadata.getFlags().setFlag(EntityFlag.RESTING, (boolean) entityMetadata.getValue());
}
if (entityMetadata.getId() == 21) { if (entityMetadata.getId() == 21) {
collarColor = (byte) (int) entityMetadata.getValue(); collarColor = (byte) (int) entityMetadata.getValue();
// Needed or else wild cats are a red color // Needed or else wild cats are a red color