From 1410a22bb205c0868d03e305242799b4bd791225 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Thu, 24 Apr 2025 13:59:28 +0200
Subject: [PATCH] Fix passengers sending when riding players Fixes #12468

---
 .../net/minecraft/server/level/ServerEntity.java.patch | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/paper-server/patches/sources/net/minecraft/server/level/ServerEntity.java.patch b/paper-server/patches/sources/net/minecraft/server/level/ServerEntity.java.patch
index 1de63e2c73..2254ee134a 100644
--- a/paper-server/patches/sources/net/minecraft/server/level/ServerEntity.java.patch
+++ b/paper-server/patches/sources/net/minecraft/server/level/ServerEntity.java.patch
@@ -28,7 +28,15 @@
          this.level = level;
          this.broadcast = broadcast;
          this.entity = entity;
-@@ -106,13 +_,14 @@
+@@ -103,16 +_,22 @@
+         if (!passengers.equals(this.lastPassengers)) {
+             List<UUID> list = this.mountedOrDismounted(passengers).map(Entity::getUUID).toList();
+             this.broadcastWithIgnore.accept(new ClientboundSetPassengersPacket(this.entity), list);
++            // Paper start - Allow riding players
++            if (this.entity instanceof ServerPlayer player) {
++                player.connection.send(new ClientboundSetPassengersPacket(this.entity));
++            }
++            // Paper end - Allow riding players
              this.lastPassengers = passengers;
          }