From b9cdcf1d687570f0b22adc8e2a9a633f122724ee Mon Sep 17 00:00:00 2001
From: Gabscap <sonstige.netzwerke@gabriel-paradzik.de>
Date: Fri, 6 May 2016 16:09:52 +0200
Subject: [PATCH] Add null-check to "Entity Tracking Improvement"

---
 Spigot-Server-Patches/Entity-Tracking-Improvements.patch | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Spigot-Server-Patches/Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/Entity-Tracking-Improvements.patch
index 7810f6a79..7b9b86138 100644
--- a/Spigot-Server-Patches/Entity-Tracking-Improvements.patch
+++ b/Spigot-Server-Patches/Entity-Tracking-Improvements.patch
@@ -77,7 +77,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    private void updatePassengers(EntityPlayer player) {
 +        if (tracker.isVehicle()) {
-+            tracker.passengers.forEach((e) -> e.tracker.updatePlayer(player));
++            tracker.passengers.forEach((e) -> {
++                if (e.tracker != null) {
++                    e.tracker.updatePlayer(player);
++                }
++            });
 +            player.playerConnection.sendPacket(new PacketPlayOutMount(this.tracker));
 +        }
 +    }