Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-10-22 12:29:59 +02:00
Code Issues Projects Releases Wiki Activity

Fix interaction height on 1.19.4

Browse Source
This commit is contained in:
fullwall 2024-07-20 18:13:17 +08:00
parent 219e016ee7
commit 3370fdde5d
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
View File

@ -636,7 +636,7 @@ public class HologramTrait extends Trait {
public void onSeenByPlayer(NPC npc, Player player) { public void onSeenByPlayer(NPC npc, Player player) {
if (lastOffset == null) if (lastOffset == null)
return; return;
NMS.linkTextInteraction(player, hologram.getEntity(), npc.getEntity(), lastOffset.y); NMS.positionInteractionText(player, hologram.getEntity(), npc.getEntity(), lastOffset.y);
} }
@Override @Override

4
main/src/main/java/net/citizensnpcs/util/NMS.java
View File

@ -689,8 +689,8 @@ public class NMS {
return BRIDGE.isValid(entity); return BRIDGE.isValid(entity);
} }
public static void linkTextInteraction(Player player, Entity interaction, Entity mount, double height) { public static void positionInteractionText(Player player, Entity interaction, Entity mount, double height) {
BRIDGE.linkTextInteraction(player, interaction, mount, height); BRIDGE.positionInteractionText(player, interaction, mount, height);
} }
public static void load(CommandManager commands) { public static void load(CommandManager commands) {

2
main/src/main/java/net/citizensnpcs/util/NMSBridge.java
View File

@ -150,7 +150,7 @@ public interface NMSBridge {
public boolean isValid(Entity entity); 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); public void load(CommandManager commands);

6
v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
View File

@ -720,7 +720,7 @@ public class NMSImpl implements NMSBridge {
@Override @Override
public float getRidingHeightOffset(org.bukkit.entity.Entity entity, org.bukkit.entity.Entity mount) { 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 @Override
@ -935,9 +935,9 @@ public class NMSImpl implements NMSBridge {
} }
@Override @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) { org.bukkit.entity.Entity mount, double offset) {
offset += -0.9 + getHandle(mount).getPassengersRidingOffset(); offset += getRidingHeightOffset(entity, mount) + 0.5;
sendPacket(player, sendPacket(player,
new ClientboundBundlePacket(List.of( new ClientboundBundlePacket(List.of(
new ClientboundSetEntityDataPacket(entity.getEntityId(), new ClientboundSetEntityDataPacket(entity.getEntityId(),

2
v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java
View File

@ -912,7 +912,7 @@ public class NMSImpl implements NMSBridge {
} }
@Override @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) { org.bukkit.entity.Entity mount, double offset) {
offset += getRidingHeightOffset(entity, mount); offset += getRidingHeightOffset(entity, mount);
sendPacket(player, sendPacket(player,

2
v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java
View File

@ -891,7 +891,7 @@ public class NMSImpl implements NMSBridge {
} }
@Override @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) { org.bukkit.entity.Entity mount, double offset) {
offset += getRidingHeightOffset(entity, mount); offset += getRidingHeightOffset(entity, mount);
sendPacket(player, sendPacket(player,