From 10b548b65458f61e3de37f7c5fd111661a33b5d5 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Thu, 20 Jan 2011 05:41:02 +0800
Subject: [PATCH] Fix up NPE's in EntityMinecart/CraftVehicle and removed a
 little un-needed code in EntityArrow

By: speakeasy <mekevin1917@gmail.com>
---
 .../main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java
index 04d8d18755..3fbd7c0087 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java
@@ -16,7 +16,7 @@ public abstract class CraftVehicle extends CraftEntity implements Vehicle {
     }
 
     public Entity getPassenger() {
-        return (getHandle().j.getBukkitEntity());
+        return isEmpty()?null:(getHandle().j.getBukkitEntity());
     }
     
     public boolean setPassenger(Entity passenger) {