diff --git a/Spigot-Server-Patches/Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/Re-track-players-that-dismount-from-other-players.patch
new file mode 100644
index 0000000000..fff06560f7
--- /dev/null
+++ b/Spigot-Server-Patches/Re-track-players-that-dismount-from-other-players.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <1254957+zachbr@users.noreply.github.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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/EntityPlayer.java
++++ b/src/main/java/net/minecraft/server/EntityPlayer.java
+@@ -0,0 +0,0 @@ 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
+ 
+     }
+ 
+--
\ No newline at end of file