From d394cc6280ca0a3c7e4e9cc9feee6d968a765554 Mon Sep 17 00:00:00 2001
From: rtm516 <ryantmilner@hotmail.co.uk>
Date: Mon, 29 Jun 2020 15:37:54 +0100
Subject: [PATCH] Update entity metadata

---
 .../entity/living/animal/StriderEntity.java    |  3 +++
 .../{HoglinEntity.java => PiglinEntity.java}   | 11 +++++++++--
 .../entity/living/monster/ZoglinEntity.java    | 18 +++++++++++++++++-
 .../connector/entity/type/EntityType.java      |  4 ++--
 4 files changed, 31 insertions(+), 5 deletions(-)
 rename connector/src/main/java/org/geysermc/connector/entity/living/monster/{HoglinEntity.java => PiglinEntity.java} (84%)

diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/StriderEntity.java b/connector/src/main/java/org/geysermc/connector/entity/living/animal/StriderEntity.java
index abf6758a2..e3ef9b501 100644
--- a/connector/src/main/java/org/geysermc/connector/entity/living/animal/StriderEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/animal/StriderEntity.java
@@ -40,6 +40,9 @@ public class StriderEntity extends AnimalEntity {
 
     @Override
     public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
+        if (entityMetadata.getId() == 17) {
+            metadata.getFlags().setFlag(EntityFlag.ALWAYS_SHOW_NAME, (boolean) entityMetadata.getValue());
+        }
         if (entityMetadata.getId() == 18) {
             metadata.getFlags().setFlag(EntityFlag.SADDLED, (boolean) entityMetadata.getValue());
         }
diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/HoglinEntity.java b/connector/src/main/java/org/geysermc/connector/entity/living/monster/PiglinEntity.java
similarity index 84%
rename from connector/src/main/java/org/geysermc/connector/entity/living/monster/HoglinEntity.java
rename to connector/src/main/java/org/geysermc/connector/entity/living/monster/PiglinEntity.java
index 10faebc78..78a420b8c 100644
--- a/connector/src/main/java/org/geysermc/connector/entity/living/monster/HoglinEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/monster/PiglinEntity.java
@@ -32,9 +32,9 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
 import org.geysermc.connector.entity.type.EntityType;
 import org.geysermc.connector.network.session.GeyserSession;
 
-public class HoglinEntity extends MonsterEntity {
+public class PiglinEntity extends MonsterEntity {
 
-    public HoglinEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) {
+    public PiglinEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) {
         super(entityId, geyserId, entityType, position, motion, rotation);
     }
 
@@ -47,6 +47,13 @@ public class HoglinEntity extends MonsterEntity {
                 metadata.getFlags().setFlag(EntityFlag.BABY, true);
             }
         }
+        if (entityMetadata.getId() == 17) {
+            metadata.getFlags().setFlag(EntityFlag.CHARGING, (boolean) entityMetadata.getValue());
+        }
+        if (entityMetadata.getId() == 18) {
+            metadata.getFlags().setFlag(EntityFlag.DANCING, (boolean) entityMetadata.getValue());
+        }
+
         super.updateBedrockMetadata(entityMetadata, session);
     }
 }
diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/monster/ZoglinEntity.java b/connector/src/main/java/org/geysermc/connector/entity/living/monster/ZoglinEntity.java
index b60a39521..4ea842110 100644
--- a/connector/src/main/java/org/geysermc/connector/entity/living/monster/ZoglinEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/monster/ZoglinEntity.java
@@ -25,12 +25,28 @@
 
 package org.geysermc.connector.entity.living.monster;
 
+import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
 import com.nukkitx.math.vector.Vector3f;
+import com.nukkitx.protocol.bedrock.data.entity.EntityData;
+import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
 import org.geysermc.connector.entity.type.EntityType;
+import org.geysermc.connector.network.session.GeyserSession;
 
-public class ZoglinEntity extends HoglinEntity {
+public class ZoglinEntity extends MonsterEntity {
 
     public ZoglinEntity(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();
+            if (isBaby) {
+                metadata.put(EntityData.SCALE, .55f);
+                metadata.getFlags().setFlag(EntityFlag.BABY, true);
+            }
+        }
+        super.updateBedrockMetadata(entityMetadata, session);
+    }
 }
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 70c76038d..1acf579f1 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
@@ -152,9 +152,9 @@ public enum EntityType {
     FOX(FoxEntity.class, 121, 0.5f, 1.25f),
     BEE(BeeEntity.class, 122, 0.6f, 0.6f),
     STRIDER(StriderEntity.class, 125, 1.7f, 0.9f, 0f, 0f, "minecraft:strider"), //TODO - update entity metadata
-    HOGLIN(HoglinEntity.class, 124, 1.4f, 1.3965f, 1.3965f, 0f, "minecraft:hoglin"), //TODO
+    HOGLIN(AnimalEntity.class, 124, 1.4f, 1.3965f, 1.3965f, 0f, "minecraft:hoglin"), //TODO
     ZOGLIN(ZoglinEntity.class, 126, 1.4f, 1.3965f, 1.3965f, 0f, "minecraft:zoglin"), //TODO
-    PIGLIN(ZombieEntity.class, 123, 1.95f, 0.6f, 0.6f, 0f, "minecraft:piglin"), //TODO
+    PIGLIN(PiglinEntity.class, 123, 1.95f, 0.6f, 0.6f, 0f, "minecraft:piglin"), //TODO
 
     /**
      * Item frames are handled differently since they are a block in Bedrock.