From 867ce2e939eb078cbd2fd268c70d50d7e3415fa5 Mon Sep 17 00:00:00 2001 From: Logan <37521985+LoJoSho@users.noreply.github.com> Date: Sat, 11 Oct 2025 22:04:30 -0500 Subject: [PATCH] Revert "fix: make mount packet sending sync to prevent problems with the backpack staying on the player" This reverts commit 3c107b51ca23c3af5acdc7d89c097b25bed5a5fe. --- .../hibiscuscommons/nms/NMSPackets.java | 5 --- .../packets/BundledRidingData.java | 37 ------------------- .../nms/v1_20_R4/NMSCommon.java | 6 --- .../nms/v1_20_R4/NMSPackets.java | 2 +- .../nms/v1_21_R1/NMSCommon.java | 6 --- .../nms/v1_21_R1/NMSPackets.java | 2 +- .../nms/v1_21_R2/NMSCommon.java | 6 --- .../nms/v1_21_R2/NMSPackets.java | 2 +- .../nms/v1_21_R3/NMSCommon.java | 6 --- .../nms/v1_21_R3/NMSPackets.java | 2 +- .../nms/v1_21_R4/NMSCommon.java | 6 --- .../nms/v1_21_R4/NMSPackets.java | 2 +- .../nms/v1_21_R5/NMSCommon.java | 6 --- .../nms/v1_21_R5/NMSPackets.java | 15 +------- 14 files changed, 6 insertions(+), 97 deletions(-) delete mode 100644 common/src/main/java/me/lojosho/hibiscuscommons/packets/BundledRidingData.java diff --git a/common/src/main/java/me/lojosho/hibiscuscommons/nms/NMSPackets.java b/common/src/main/java/me/lojosho/hibiscuscommons/nms/NMSPackets.java index 8364a7d..c7c6e01 100644 --- a/common/src/main/java/me/lojosho/hibiscuscommons/nms/NMSPackets.java +++ b/common/src/main/java/me/lojosho/hibiscuscommons/nms/NMSPackets.java @@ -2,7 +2,6 @@ package me.lojosho.hibiscuscommons.nms; import it.unimi.dsi.fastutil.Pair; import it.unimi.dsi.fastutil.ints.IntList; -import me.lojosho.hibiscuscommons.packets.BundledRidingData; import net.kyori.adventure.text.Component; import org.bukkit.GameMode; import org.bukkit.Location; @@ -105,9 +104,5 @@ public interface NMSPackets { void sendInvisibleEntity(int entityId, EntityType type, Location location, UUID uuid, List sendTo); - default void sendBundledRidingPacket(BundledRidingData packet, List sendTo) { - - } - Object createMountPacket(int entityId, int[] passengerIds); } diff --git a/common/src/main/java/me/lojosho/hibiscuscommons/packets/BundledRidingData.java b/common/src/main/java/me/lojosho/hibiscuscommons/packets/BundledRidingData.java deleted file mode 100644 index 19fd395..0000000 --- a/common/src/main/java/me/lojosho/hibiscuscommons/packets/BundledRidingData.java +++ /dev/null @@ -1,37 +0,0 @@ -package me.lojosho.hibiscuscommons.packets; - -import me.lojosho.hibiscuscommons.nms.NMSHandlers; -import org.bukkit.entity.Player; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -public class BundledRidingData { - - private final LinkedHashMap> QUEUED_PACKETS = new LinkedHashMap<>(); - - public BundledRidingData() { - - } - - public void add(int owner, int passenger) { - add(owner, List.of(passenger)); - } - - public void add(int owner, List passengers) { - QUEUED_PACKETS.put(owner, passengers); - } - - public Map> getQueued() { - return QUEUED_PACKETS; - } - - /** - * To be sent all at once to the players specified. - */ - public void send(List sendTo) { - NMSHandlers.getHandler().getPacketHandler().sendBundledRidingPacket(this, sendTo); - } - -} diff --git a/v1_20_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSCommon.java b/v1_20_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSCommon.java index 4aabdc7..5d876d7 100644 --- a/v1_20_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSCommon.java +++ b/v1_20_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSCommon.java @@ -30,10 +30,4 @@ public class NMSCommon { } }); } - - public void sendPacketSync(@NotNull Player player, @NotNull Packet packet) { - ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle(); - ServerPlayerConnection connection = serverPlayer.connection; - connection.send(packet); - } } diff --git a/v1_20_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSPackets.java b/v1_20_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSPackets.java index 2da963a..bc540a1 100644 --- a/v1_20_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSPackets.java +++ b/v1_20_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSPackets.java @@ -282,7 +282,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons. fakeNmsEntity.passengers = ImmutableList.copyOf(passengers); ClientboundSetPassengersPacket packet = new ClientboundSetPassengersPacket(fakeNmsEntity); fakeNmsEntity.passengers = ImmutableList.of(); - for (Player p : sendTo) sendPacketSync(p, packet); + for (Player p : sendTo) sendPacket(p, packet); } @Override diff --git a/v1_21_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSCommon.java b/v1_21_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSCommon.java index 722e8a5..f56884e 100644 --- a/v1_21_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSCommon.java +++ b/v1_21_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSCommon.java @@ -30,10 +30,4 @@ public class NMSCommon { } }); } - - public void sendPacketSync(@NotNull Player player, @NotNull Packet packet) { - ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle(); - ServerPlayerConnection connection = serverPlayer.connection; - connection.send(packet); - } } diff --git a/v1_21_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSPackets.java b/v1_21_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSPackets.java index 42ec3b0..1fd482a 100644 --- a/v1_21_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSPackets.java +++ b/v1_21_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSPackets.java @@ -282,7 +282,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons. fakeNmsEntity.passengers = ImmutableList.copyOf(passengers); ClientboundSetPassengersPacket packet = new ClientboundSetPassengersPacket(fakeNmsEntity); fakeNmsEntity.passengers = ImmutableList.of(); - for (Player p : sendTo) sendPacketSync(p, packet); + for (Player p : sendTo) sendPacket(p, packet); } @Override diff --git a/v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSCommon.java b/v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSCommon.java index 718fabd..e5c6251 100644 --- a/v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSCommon.java +++ b/v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSCommon.java @@ -30,10 +30,4 @@ public class NMSCommon { } }); } - - public void sendPacketSync(@NotNull Player player, @NotNull Packet packet) { - ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle(); - ServerPlayerConnection connection = serverPlayer.connection; - connection.send(packet); - } } diff --git a/v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSPackets.java b/v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSPackets.java index 57b65e6..de40c33 100644 --- a/v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSPackets.java +++ b/v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSPackets.java @@ -283,7 +283,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons. fakeNmsEntity.passengers = ImmutableList.copyOf(passengers); ClientboundSetPassengersPacket packet = new ClientboundSetPassengersPacket(fakeNmsEntity); fakeNmsEntity.passengers = ImmutableList.of(); - for (Player p : sendTo) sendPacketSync(p, packet); + for (Player p : sendTo) sendPacket(p, packet); } @Override diff --git a/v1_21_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R3/NMSCommon.java b/v1_21_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R3/NMSCommon.java index 432c669..6243a8a 100644 --- a/v1_21_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R3/NMSCommon.java +++ b/v1_21_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R3/NMSCommon.java @@ -30,10 +30,4 @@ public class NMSCommon { } }); } - - public void sendPacketSync(@NotNull Player player, @NotNull Packet packet) { - ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle(); - ServerPlayerConnection connection = serverPlayer.connection; - connection.send(packet); - } } diff --git a/v1_21_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R3/NMSPackets.java b/v1_21_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R3/NMSPackets.java index fe1ac07..f492de9 100644 --- a/v1_21_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R3/NMSPackets.java +++ b/v1_21_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R3/NMSPackets.java @@ -285,7 +285,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons. fakeNmsEntity.passengers = ImmutableList.copyOf(passengers); ClientboundSetPassengersPacket packet = new ClientboundSetPassengersPacket(fakeNmsEntity); fakeNmsEntity.passengers = ImmutableList.of(); - for (Player p : sendTo) sendPacketSync(p, packet); + for (Player p : sendTo) sendPacket(p, packet); } @Override diff --git a/v1_21_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R4/NMSCommon.java b/v1_21_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R4/NMSCommon.java index 1ce5f4d..db885dd 100644 --- a/v1_21_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R4/NMSCommon.java +++ b/v1_21_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R4/NMSCommon.java @@ -30,10 +30,4 @@ public class NMSCommon { } }); } - - public void sendPacketSync(@NotNull Player player, @NotNull Packet packet) { - ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle(); - ServerPlayerConnection connection = serverPlayer.connection; - connection.send(packet); - } } diff --git a/v1_21_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R4/NMSPackets.java b/v1_21_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R4/NMSPackets.java index a509b80..c1bcd86 100644 --- a/v1_21_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R4/NMSPackets.java +++ b/v1_21_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R4/NMSPackets.java @@ -285,7 +285,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons. fakeNmsEntity.passengers = ImmutableList.copyOf(passengers); ClientboundSetPassengersPacket packet = new ClientboundSetPassengersPacket(fakeNmsEntity); fakeNmsEntity.passengers = ImmutableList.of(); - for (Player p : sendTo) sendPacketSync(p, packet); + for (Player p : sendTo) sendPacket(p, packet); } @Override diff --git a/v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSCommon.java b/v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSCommon.java index cc81756..de8bf0e 100644 --- a/v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSCommon.java +++ b/v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSCommon.java @@ -30,10 +30,4 @@ public class NMSCommon { } }); } - - public void sendPacketSync(@NotNull Player player, @NotNull Packet packet) { - ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle(); - ServerPlayerConnection connection = serverPlayer.connection; - connection.send(packet); - } } diff --git a/v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSPackets.java b/v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSPackets.java index 83672a6..8bb01ef 100644 --- a/v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSPackets.java +++ b/v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSPackets.java @@ -10,7 +10,6 @@ import com.mojang.serialization.JsonOps; import io.papermc.paper.adventure.PaperAdventure; import it.unimi.dsi.fastutil.ints.IntList; import me.lojosho.hibiscuscommons.HibiscusCommonsPlugin; -import me.lojosho.hibiscuscommons.packets.BundledRidingData; import me.lojosho.hibiscuscommons.util.AdventureUtils; import me.lojosho.hibiscuscommons.util.MessagesUtil; import net.kyori.adventure.text.Component; @@ -283,7 +282,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons. fakeNmsEntity.passengers = ImmutableList.copyOf(passengers); ClientboundSetPassengersPacket packet = new ClientboundSetPassengersPacket(fakeNmsEntity); fakeNmsEntity.passengers = ImmutableList.of(); - for (Player p : sendTo) sendPacketSync(p, packet); + for (Player p : sendTo) sendPacket(p, packet); } @Override @@ -563,16 +562,4 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons. ClientboundBundlePacket bundlePacket = new ClientboundBundlePacket(List.of(spawnPacket, dataPacket)); sendPacket(sendTo, bundlePacket); } - - @Override - public void sendBundledRidingPacket(BundledRidingData packet, List sendTo) { - List packets = new ArrayList<>(); - for (Map.Entry> entry : packet.getQueued().entrySet()) { - packets.add((ClientboundSetPassengersPacket) createMountPacket(entry.getKey(), entry.getValue().stream() - .mapToInt(Integer::intValue) - .toArray())); - } - ClientboundBundlePacket bundlePacket = new ClientboundBundlePacket(List.copyOf(packets)); - sendPacket(sendTo, bundlePacket); - } }