Fix up NPE's in EntityMinecart/CraftVehicle and removed a little un-needed code in EntityArrow

2011-01-20 05:41:02 +08:00
parent eabdc7ffa9
commit e93061be48
3 changed files with 7 additions and 5 deletions
--- 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) {