Revert "fix: make mount packet sending sync to prevent problems with the backpack staying on the player"

This reverts commit 3c107b51ca.

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<Player> sendTo);
 
-    default void sendBundledRidingPacket(BundledRidingData packet, List<Player> sendTo) {
-
-    }
-
     Object createMountPacket(int entityId, int[] passengerIds);
 }

common/src/main/java/me/lojosho/hibiscuscommons/packets/BundledRidingData.java

@@ -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<Integer, List<Integer>> QUEUED_PACKETS = new LinkedHashMap<>();
-
-    public BundledRidingData() {
-
-    }
-
-    public void add(int owner, int passenger) {
-        add(owner, List.of(passenger));
-    }
-
-    public void add(int owner, List<Integer> passengers) {
-        QUEUED_PACKETS.put(owner, passengers);
-    }
-
-    public Map<Integer, List<Integer>> getQueued() {
-        return QUEUED_PACKETS;
-    }
-
-    /**
-     * To be sent all at once to the players specified.
-     */
-    public void send(List<Player> sendTo) {
-        NMSHandlers.getHandler().getPacketHandler().sendBundledRidingPacket(this, sendTo);
-    }
-
-}

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);
-    }
 }

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

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);
-    }
 }

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

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);
-    }
 }

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

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);
-    }
 }

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

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);
-    }
 }

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

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);
-    }
 }

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<Player> sendTo) {
-        List<ClientboundSetPassengersPacket> packets = new ArrayList<>();
-        for (Map.Entry<Integer, List<Integer>> 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);
-    }
 }