From c8e0cdde6858beb23822f20022009cad5705686b Mon Sep 17 00:00:00 2001
From: onebeastchris <github@onechris.mozmail.com>
Date: Wed, 3 Jul 2024 18:30:34 +0200
Subject: [PATCH] Code cleanup

---
 .../geyser/entity/type/DisplayBaseEntity.java | 20 +++++--------------
 .../org/geysermc/geyser/util/EntityUtils.java | 11 ++++++----
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/DisplayBaseEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/DisplayBaseEntity.java
index b65844067..08b107cd6 100644
--- a/core/src/main/java/org/geysermc/geyser/entity/type/DisplayBaseEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/type/DisplayBaseEntity.java
@@ -26,6 +26,7 @@
 package org.geysermc.geyser.entity.type;
 
 import net.kyori.adventure.text.Component;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.cloudburstmc.math.vector.Vector3f;
 import org.geysermc.geyser.entity.EntityDefinition;
 import org.geysermc.geyser.session.GeyserSession;
@@ -38,18 +39,12 @@ import java.util.UUID;
 
 public class DisplayBaseEntity extends Entity {
 
-    private Vector3f baseTranslation;
-    private boolean noBaseTranslation;
+    private @Nullable Vector3f baseTranslation;
 
     public DisplayBaseEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw) {
         super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw);
     }
 
-    @Override
-    protected void initializeMetadata() {
-        super.initializeMetadata();
-    }
-
     @Override
     public void setDisplayNameVisible(BooleanEntityMetadata entityMetadata) {
         // Don't allow the display name to be hidden - messes with our armor stand.
@@ -64,24 +59,19 @@ public class DisplayBaseEntity extends Entity {
 
     public void setTranslation(EntityMetadata<Vector3f, ?> translationMeta){
         this.baseTranslation = translationMeta.getValue();
-        if (this.baseTranslation == null){
-            this.noBaseTranslation = true;
+        if (this.baseTranslation == null) {
             return;
         }
-        if (this.vehicle == null){
+        if (this.vehicle == null) {
             this.setRiderSeatPosition(this.baseTranslation);
             this.moveRelative(0, this.baseTranslation.getY(), 0, yaw, pitch, headYaw, false);
         } else {
             EntityUtils.updateMountOffset(this, this.vehicle, true, true, false);
+            this.updateBedrockMetadata();
         }
     }
 
     public Vector3f getTranslation() {
         return baseTranslation;
     }
-
-    public boolean hasTranslation(){
-        return !this.noBaseTranslation;
-    }
-
 }
diff --git a/core/src/main/java/org/geysermc/geyser/util/EntityUtils.java b/core/src/main/java/org/geysermc/geyser/util/EntityUtils.java
index ca1ee1f42..53aefde1e 100644
--- a/core/src/main/java/org/geysermc/geyser/util/EntityUtils.java
+++ b/core/src/main/java/org/geysermc/geyser/util/EntityUtils.java
@@ -202,11 +202,14 @@ public final class EntityUtils {
                 case TRADER_LLAMA, LLAMA -> zOffset = -0.3f;
                 case TEXT_DISPLAY -> {
                     if (passenger instanceof TextDisplayEntity textDisplay) {
-                        if (!textDisplay.hasTranslation()) return;
+                        Vector3f displayTranslation = textDisplay.getTranslation();
+                        if (displayTranslation == null) {
+                            return;
+                        }
 
-                        xOffset = textDisplay.getTranslation().getX();
-                        yOffset = textDisplay.getTranslation().getY() + 0.2f;
-                        zOffset = textDisplay.getTranslation().getZ();
+                        xOffset = displayTranslation.getX();
+                        yOffset = displayTranslation.getY() + 0.2f;
+                        zOffset = displayTranslation.getZ();
                     }
                 }
             }