Paper/Spigot-Server-Patches/0165-Re-track-players-that-dismount-from-other-players.patch
Zach Brown b170e8cedb
Update upstream B/CB/S
Remove two features added upstream
2016-08-27 18:41:58 -05:00

28 lines
1.1 KiB
Diff

From 89a5d2bf5922e2e430f947d46c01492d9ebbabf6 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 31 Jul 2016 16:33:03 -0500
Subject: [PATCH] Re-track players that dismount from other players
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index d084fc2..ec3a60a 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -648,6 +648,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
if (entity1 != entity && this.playerConnection != null) {
this.playerConnection.a(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
}
+ // Paper start - "Fixes" an issue in which the vehicle player would not be notified that the passenger dismounted
+ if (entity instanceof EntityPlayer) {
+ WorldServer worldServer = (WorldServer) entity.getWorld();
+ worldServer.tracker.untrackEntity(this);
+ worldServer.tracker.track(this);
+ }
+ // Paper end
}
--
2.9.2.windows.1