From e93061be489dc6f3b4950284e41e50501e55450f Mon Sep 17 00:00:00 2001 From: speakeasy Date: Thu, 20 Jan 2011 05:41:02 +0800 Subject: Fix up NPE's in EntityMinecart/CraftVehicle and removed a little un-needed code in EntityArrow --- src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java index 04d8d187..3fbd7c00 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVehicle.java +++ b/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) { -- cgit v1.2.3