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

This commit is contained in:
speakeasy
2011-01-20 05:41:02 +08:00
committed by tahg
parent eabdc7ffa9
commit e93061be48
3 changed files with 7 additions and 5 deletions

View File

@@ -178,9 +178,7 @@ public class EntityArrow extends Entity {
// or leave as DamageCause.ENTITY_ATTACK
org.bukkit.entity.Entity shooter = null;
if ((EntityLiving)b != null) {
shooter = new org.bukkit.craftbukkit.entity.CraftLivingEntity(server, b);
} else if ((Entity)b != null) {
shooter = (org.bukkit.entity.Entity) b.getBukkitEntity();
shooter = b.getBukkitEntity();
}
EntityDamageByProjectileEvent edbpe = new EntityDamageByProjectileEvent(shooter, entity.getBukkitEntity(), this.getBukkitEntity(), EntityDamageEvent.DamageCause.ENTITY_ATTACK, 4);