From b21f4773669a304694bc64ed5ed199263f5ab473 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+DoctorMacc@users.noreply.github.com>
Date: Wed, 2 Sep 2020 00:39:06 -0400
Subject: [PATCH] Parrot mounting fixes (#1236)

* Parrot mounting fixes

- Fix duplicate parrots when a parrot leaves the player
- Fix rotation of parrots

* Remove critical debug information
---
 .../connector/entity/PlayerEntity.java        | 31 ++++++++++++++++---
 .../player/BedrockMovePlayerTranslator.java   |  7 +++++
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/entity/PlayerEntity.java b/connector/src/main/java/org/geysermc/connector/entity/PlayerEntity.java
index da75812f..58b32e62 100644
--- a/connector/src/main/java/org/geysermc/connector/entity/PlayerEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/PlayerEntity.java
@@ -43,6 +43,7 @@ import lombok.Getter;
 import lombok.Setter;
 import org.geysermc.connector.entity.attribute.Attribute;
 import org.geysermc.connector.entity.attribute.AttributeType;
+import org.geysermc.connector.entity.living.animal.tameable.ParrotEntity;
 import org.geysermc.connector.entity.type.EntityType;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.session.cache.EntityEffectCache;
@@ -65,8 +66,14 @@ public class PlayerEntity extends LivingEntity {
     private boolean playerList = true;  // Player is in the player list
     private final EntityEffectCache effectCache;
 
-    private Entity leftParrot;
-    private Entity rightParrot;
+    /**
+     * Saves the parrot currently on the player's left shoulder; otherwise null
+     */
+    private ParrotEntity leftParrot;
+    /**
+     * Saves the parrot currently on the player's right shoulder; otherwise null
+     */
+    private ParrotEntity rightParrot;
 
     public PlayerEntity(GameProfile gameProfile, long entityId, long geyserId, Vector3f position, Vector3f motion, Vector3f rotation) {
         super(entityId, geyserId, EntityType.PLAYER, position, motion, rotation);
@@ -189,6 +196,12 @@ public class PlayerEntity extends LivingEntity {
     @Override
     public void updatePositionAndRotation(GeyserSession session, double moveX, double moveY, double moveZ, float yaw, float pitch, boolean isOnGround) {
         moveRelative(session, moveX, moveY, moveZ, yaw, pitch, isOnGround);
+        if (leftParrot != null) {
+            leftParrot.moveRelative(session, moveX, moveY, moveZ, yaw, pitch, isOnGround);
+        }
+        if (rightParrot != null) {
+            rightParrot.moveRelative(session, moveX, moveY, moveZ, yaw, pitch, isOnGround);
+        }
     }
 
     @Override
@@ -202,6 +215,12 @@ public class PlayerEntity extends LivingEntity {
         movePlayerPacket.setOnGround(isOnGround);
         movePlayerPacket.setMode(MovePlayerPacket.Mode.HEAD_ROTATION);
         session.sendUpstreamPacket(movePlayerPacket);
+        if (leftParrot != null) {
+            leftParrot.updateRotation(session, yaw, pitch, isOnGround);
+        }
+        if (rightParrot != null) {
+            rightParrot.updateRotation(session, yaw, pitch, isOnGround);
+        }
     }
 
     @Override
@@ -237,11 +256,15 @@ public class PlayerEntity extends LivingEntity {
         }
 
         // Parrot occupying shoulder
-        if ((entityMetadata.getId() == 18 && leftParrot == null) || (entityMetadata.getId() == 19 && rightParrot == null)) { // null check since this code just creates the parrot
+        if (entityMetadata.getId() == 18 || entityMetadata.getId() == 19) {
             CompoundTag tag = (CompoundTag) entityMetadata.getValue();
             if (tag != null && !tag.isEmpty()) {
+                if ((entityMetadata.getId() == 18 && leftParrot != null) || (entityMetadata.getId() == 19 && rightParrot != null)) {
+                    // No need to update a parrot's data when it already exists
+                    return;
+                }
                 // The parrot is a separate entity in Bedrock, but part of the player entity in Java
-                Entity parrot = new Entity(0, session.getEntityCache().getNextEntityId().incrementAndGet(),
+                ParrotEntity parrot = new ParrotEntity(0, session.getEntityCache().getNextEntityId().incrementAndGet(),
                         EntityType.PARROT, position, motion, rotation);
                 parrot.spawnEntity(session);
                 parrot.getMetadata().put(EntityData.VARIANT, tag.get("Variant").getValue());
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockMovePlayerTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockMovePlayerTranslator.java
index be918ba7..8809941b 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockMovePlayerTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/entity/player/BedrockMovePlayerTranslator.java
@@ -86,6 +86,13 @@ public class BedrockMovePlayerTranslator extends PacketTranslator<MovePlayerPack
         entity.setPosition(packet.getPosition().sub(0, EntityType.PLAYER.getOffset(), 0));
         entity.setRotation(rotation);
         entity.setOnGround(packet.isOnGround());
+        // Move parrots to match if applicable
+        if (entity.getLeftParrot() != null) {
+            entity.getLeftParrot().moveAbsolute(session, entity.getPosition(), entity.getRotation(), true, false);
+        }
+        if (entity.getRightParrot() != null) {
+            entity.getRightParrot().moveAbsolute(session, entity.getPosition(), entity.getRotation(), true, false);
+        }
 
         /*
         boolean colliding = false;