From 3370fdde5dd0c9b5947226a01ee7bf1b3317f0cf Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Sat, 20 Jul 2024 18:13:17 +0800
Subject: [PATCH] Fix interaction height on 1.19.4

---
 .../src/main/java/net/citizensnpcs/trait/HologramTrait.java | 2 +-
 main/src/main/java/net/citizensnpcs/util/NMS.java           | 4 ++--
 main/src/main/java/net/citizensnpcs/util/NMSBridge.java     | 2 +-
 .../java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java    | 6 +++---
 .../java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java    | 2 +-
 .../java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java    | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
index bdfe79ca8..9a5661e80 100644
--- a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
@@ -636,7 +636,7 @@ public class HologramTrait extends Trait {
         public void onSeenByPlayer(NPC npc, Player player) {
             if (lastOffset == null)
                 return;
-            NMS.linkTextInteraction(player, hologram.getEntity(), npc.getEntity(), lastOffset.y);
+            NMS.positionInteractionText(player, hologram.getEntity(), npc.getEntity(), lastOffset.y);
         }
 
         @Override
diff --git a/main/src/main/java/net/citizensnpcs/util/NMS.java b/main/src/main/java/net/citizensnpcs/util/NMS.java
index 001d4cce6..1b380c0fc 100644
--- a/main/src/main/java/net/citizensnpcs/util/NMS.java
+++ b/main/src/main/java/net/citizensnpcs/util/NMS.java
@@ -689,8 +689,8 @@ public class NMS {
         return BRIDGE.isValid(entity);
     }
 
-    public static void linkTextInteraction(Player player, Entity interaction, Entity mount, double height) {
-        BRIDGE.linkTextInteraction(player, interaction, mount, height);
+    public static void positionInteractionText(Player player, Entity interaction, Entity mount, double height) {
+        BRIDGE.positionInteractionText(player, interaction, mount, height);
     }
 
     public static void load(CommandManager commands) {
diff --git a/main/src/main/java/net/citizensnpcs/util/NMSBridge.java b/main/src/main/java/net/citizensnpcs/util/NMSBridge.java
index 9522aab9a..fe76b69c8 100644
--- a/main/src/main/java/net/citizensnpcs/util/NMSBridge.java
+++ b/main/src/main/java/net/citizensnpcs/util/NMSBridge.java
@@ -150,7 +150,7 @@ public interface NMSBridge {
 
     public boolean isValid(Entity entity);
 
-    public default void linkTextInteraction(Player player, Entity interaction, Entity mount, double height) {
+    public default void positionInteractionText(Player player, Entity interaction, Entity mount, double height) {
     }
 
     public void load(CommandManager commands);
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
index ecce9a085..9bb0a58c8 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
@@ -720,7 +720,7 @@ public class NMSImpl implements NMSBridge {
 
     @Override
     public float getRidingHeightOffset(org.bukkit.entity.Entity entity, org.bukkit.entity.Entity mount) {
-        return (float) (getHandle(mount).getPassengersRidingOffset() - 0.5D);
+        return (float) (getHandle(mount).getPassengersRidingOffset());
     }
 
     @Override
@@ -935,9 +935,9 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void linkTextInteraction(org.bukkit.entity.Player player, org.bukkit.entity.Entity entity,
+    public void positionInteractionText(org.bukkit.entity.Player player, org.bukkit.entity.Entity entity,
             org.bukkit.entity.Entity mount, double offset) {
-        offset += -0.9 + getHandle(mount).getPassengersRidingOffset();
+        offset += getRidingHeightOffset(entity, mount) + 0.5;
         sendPacket(player,
                 new ClientboundBundlePacket(List.of(
                         new ClientboundSetEntityDataPacket(entity.getEntityId(),
diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java
index ddd2033f3..d9cb3f5e4 100644
--- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java
+++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java
@@ -912,7 +912,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void linkTextInteraction(org.bukkit.entity.Player player, org.bukkit.entity.Entity entity,
+    public void positionInteractionText(org.bukkit.entity.Player player, org.bukkit.entity.Entity entity,
             org.bukkit.entity.Entity mount, double offset) {
         offset += getRidingHeightOffset(entity, mount);
         sendPacket(player,
diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java
index 4714dbad6..3a7baf999 100644
--- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java
+++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java
@@ -891,7 +891,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void linkTextInteraction(org.bukkit.entity.Player player, org.bukkit.entity.Entity entity,
+    public void positionInteractionText(org.bukkit.entity.Player player, org.bukkit.entity.Entity entity,
             org.bukkit.entity.Entity mount, double offset) {
         offset += getRidingHeightOffset(entity, mount);
         sendPacket(player,