From 8f1cb77f10ca321153d3555152abc695bc35952c Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Fri, 27 Oct 2023 15:48:13 +0200
Subject: [PATCH] Resend entity using the bundle packet (#9853)

---
 patches/server/Properly-resend-entities.patch | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/patches/server/Properly-resend-entities.patch b/patches/server/Properly-resend-entities.patch
index 414992a3be..99ccc56552 100644
--- a/patches/server/Properly-resend-entities.patch
+++ b/patches/server/Properly-resend-entities.patch
@@ -58,9 +58,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            return;
 +        }
 +
-+        net.minecraft.server.level.ServerEntity serverEntity = this.entity.tracker.serverEntity;
 +        if (player.getBukkitEntity().canSee(entity.getBukkitEntity())) {
-+            serverEntity.sendPairingData(player, player.connection::send);
++            net.minecraft.server.level.ServerEntity serverEntity = this.entity.tracker.serverEntity;
++
++            List<net.minecraft.network.protocol.Packet<net.minecraft.network.protocol.game.ClientGamePacketListener>> list = new ArrayList<>();
++            serverEntity.sendPairingData(player, list::add);
++            player.connection.send(new net.minecraft.network.protocol.game.ClientboundBundlePacket(list));
 +        }
 +    }
 +