From 3437fc98d8db1ae1172295c21e5c97f210d9e803 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Sat, 31 Dec 2022 19:34:43 -0500
Subject: [PATCH] Fix ageable entity scales not applying by default

Fixes #3486
---
 .../geysermc/geyser/entity/type/living/AgeableEntity.java   | 6 ++++++
 .../geyser/entity/type/living/animal/RabbitEntity.java      | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/living/AgeableEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/AgeableEntity.java
index 2d1de8ed2..5e604fa2b 100644
--- a/core/src/main/java/org/geysermc/geyser/entity/type/living/AgeableEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/AgeableEntity.java
@@ -40,6 +40,12 @@ public class AgeableEntity extends CreatureEntity {
         super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw);
     }
 
+    @Override
+    protected void initializeMetadata() {
+        // Required as of 1.19.3 Java
+        dirtyMetadata.put(EntityData.SCALE, getAdultSize());
+    }
+
     public void setBaby(BooleanEntityMetadata entityMetadata) {
         boolean isBaby = entityMetadata.getPrimitiveValue();
         dirtyMetadata.put(EntityData.SCALE, isBaby ? getBabySize() : getAdultSize());
diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/RabbitEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/RabbitEntity.java
index c49c9beb3..afa2530d3 100644
--- a/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/RabbitEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/RabbitEntity.java
@@ -25,7 +25,6 @@
 
 package org.geysermc.geyser.entity.type.living.animal;
 
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.type.IntEntityMetadata;
 import com.nukkitx.math.vector.Vector3f;
 import com.nukkitx.protocol.bedrock.data.entity.EntityData;
@@ -42,11 +41,6 @@ public class RabbitEntity extends AnimalEntity {
         super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw);
     }
 
-    @Override
-    public void setBaby(BooleanEntityMetadata entityMetadata) {
-        super.setBaby(entityMetadata);
-    }
-
     public void setRabbitVariant(IntEntityMetadata entityMetadata) {
         int variant = entityMetadata.getPrimitiveValue();