From a3cdfc5306dbbc941ea2a751482ce2776503737e Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Sun, 29 May 2022 21:11:10 -0400 Subject: [PATCH] Use correct type for entity metadata --- .../src/main/java/org/geysermc/geyser/entity/type/Entity.java | 4 ++-- .../geyser/entity/type/living/animal/AxolotlEntity.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/Entity.java b/core/src/main/java/org/geysermc/geyser/entity/type/Entity.java index 4dc3a437a..52efcf67e 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/type/Entity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/Entity.java @@ -141,7 +141,7 @@ public class Entity { */ protected void initializeMetadata() { dirtyMetadata.put(EntityData.SCALE, 1f); - dirtyMetadata.put(EntityData.COLOR, 0); + dirtyMetadata.put(EntityData.COLOR, (byte) 0); dirtyMetadata.put(EntityData.MAX_AIR_SUPPLY, getMaxAir()); setDimensions(Pose.STANDING); setFlag(EntityFlag.HAS_GRAVITY, true); @@ -351,7 +351,7 @@ public class Entity { dirtyMetadata.put(EntityData.AIR_SUPPLY, (short) MathUtils.constrain(amount, 0, getMaxAir())); } - protected int getMaxAir() { + protected short getMaxAir() { return 300; } diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AxolotlEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AxolotlEntity.java index 446892016..ca7ee57a2 100644 --- a/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AxolotlEntity.java +++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/AxolotlEntity.java @@ -65,7 +65,7 @@ public class AxolotlEntity extends AnimalEntity { } @Override - protected int getMaxAir() { + protected short getMaxAir() { return 6000; }