diff --git a/Spigot-Server-Patches/0167-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0167-Re-track-players-that-dismount-from-other-players.patch
new file mode 100644
index 0000000000..e23c0d6f7d
--- /dev/null
+++ b/Spigot-Server-Patches/0167-Re-track-players-that-dismount-from-other-players.patch
@@ -0,0 +1,27 @@
+From df7fd0dcde6b1ebb30586285d0fd93de291c624a 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.0
+