From 29db051e6e09b18dd865791a7f1c91eb098ae5b7 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Fri, 10 Jun 2022 10:39:19 +1000
Subject: [PATCH] SPIGOT-7048: addPassenger() not working when vehicle is
 player

By: md_5 <git@md-5.net>
---
 .../net/minecraft/server/level/EntityTrackerEntry.patch  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/paper-server/nms-patches/net/minecraft/server/level/EntityTrackerEntry.patch b/paper-server/nms-patches/net/minecraft/server/level/EntityTrackerEntry.patch
index b3c4426f92..e36650aa30 100644
--- a/paper-server/nms-patches/net/minecraft/server/level/EntityTrackerEntry.patch
+++ b/paper-server/nms-patches/net/minecraft/server/level/EntityTrackerEntry.patch
@@ -27,6 +27,15 @@
          this.ap = Vec3D.ZERO;
          this.lastPassengers = Collections.emptyList();
          this.level = worldserver;
+@@ -80,7 +90,7 @@
+ 
+         if (!list.equals(this.lastPassengers)) {
+             this.lastPassengers = list;
+-            this.broadcast.accept(new PacketPlayOutMount(this.entity));
++            this.broadcastAndSend(new PacketPlayOutMount(this.entity)); // CraftBukkit
+         }
+ 
+         Entity entity = this.entity;
 @@ -88,18 +98,18 @@
          if (entity instanceof EntityItemFrame) {
              EntityItemFrame entityitemframe = (EntityItemFrame) entity;