From efd5bae13b06a4487382fdc843253901614bbe62 Mon Sep 17 00:00:00 2001
From: OnlyBMan <27742182+OnlyBMan@users.noreply.github.com>
Date: Sun, 22 Dec 2019 12:35:22 -0500
Subject: [PATCH] Fix baby animal sizes

This should fix most baby animal sizes including Rabbits and their adult sizes!
---
 .../entity/living/AgeableEntity.java          |  9 ++++--
 .../connector/entity/living/RabbitEntity.java | 30 +++++++++++++++++++
 .../connector/entity/type/EntityType.java     |  2 +-
 3 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 connector/src/main/java/org/geysermc/connector/entity/living/RabbitEntity.java

diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/AgeableEntity.java b/connector/src/main/java/org/geysermc/connector/entity/living/AgeableEntity.java
index 7feaacba..69c54034 100644
--- a/connector/src/main/java/org/geysermc/connector/entity/living/AgeableEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/AgeableEntity.java
@@ -28,6 +28,7 @@ package org.geysermc.connector.entity.living;
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.MetadataType;
 import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.protocol.bedrock.data.EntityData;
 import com.nukkitx.protocol.bedrock.data.EntityFlag;
 import org.geysermc.connector.entity.type.EntityType;
 import org.geysermc.connector.network.session.GeyserSession;
@@ -40,8 +41,12 @@ public class AgeableEntity extends CreatureEntity {
 
     @Override
     public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
-        if (entityMetadata.getId() == 15) {
-            metadata.getFlags().setFlag(EntityFlag.BABY, (boolean) entityMetadata.getValue());
+        if (entityMetadata.getId() == 15 && entityType != EntityType.RABBIT) {
+            boolean isBaby = (boolean) entityMetadata.getValue();
+            metadata.getFlags().setFlag(EntityFlag.BABY, isBaby);
+            if (isBaby) {
+                metadata.put(EntityData.SCALE, .55f);
+            }
         }
 
         super.updateBedrockMetadata(entityMetadata, session);
diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/RabbitEntity.java b/connector/src/main/java/org/geysermc/connector/entity/living/RabbitEntity.java
new file mode 100644
index 00000000..9b9dd583
--- /dev/null
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/RabbitEntity.java
@@ -0,0 +1,30 @@
+package org.geysermc.connector.entity.living;
+
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
+import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.protocol.bedrock.data.EntityData;
+import com.nukkitx.protocol.bedrock.data.EntityFlag;
+import org.geysermc.connector.entity.type.EntityType;
+import org.geysermc.connector.network.session.GeyserSession;
+
+public class RabbitEntity extends AnimalEntity {
+    public RabbitEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) {
+        super(entityId, geyserId, entityType, position, motion, rotation);
+    }
+
+    @Override
+    public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
+        if (entityMetadata.getId() == 15) {
+            boolean isBaby = (boolean) entityMetadata.getValue();
+            metadata.getFlags().setFlag(EntityFlag.BABY, isBaby);
+            if(isBaby) {
+                metadata.put(EntityData.SCALE, .35f);
+            }
+            else {
+                metadata.put(EntityData.SCALE, .55f);
+            }
+        }
+
+        super.updateBedrockMetadata(entityMetadata, session);
+    }
+}
\ No newline at end of file
diff --git a/connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java b/connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java
index 1179617d..3fc79ed1 100644
--- a/connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java
@@ -44,7 +44,7 @@ public enum EntityType {
     VILLAGER(AbstractMerchantEntity.class, 15, 1.8f, 0.6f, 0.6f, 1.62f),
     MOOSHROOM(AnimalEntity.class, 16, 1.4f, 0.9f),
     SQUID(WaterEntity.class, 17, 0.8f),
-    RABBIT(AnimalEntity.class, 18, 0.5f, 0.4f),
+    RABBIT(RabbitEntity.class, 18, 0.5f, 0.4f),
     BAT(AmbientEntity.class, 19, 0.9f, 0.5f),
     IRON_GOLEM(GolemEntity.class, 20, 2.7f, 1.4f),
     SNOW_GOLEM(GolemEntity.class, 21, 1.9f, 0.7f),