Fixed EntityArrow just to use the PVP setting if the destination is a

Player. Fixes BUKKIT-803
Dieser Commit ist enthalten in:
steffen 2012-02-19 11:59:43 +01:00 committet von EvilSeph
Ursprung a7f0b70a3a
Commit 2887f99fe5

Datei anzeigen

@ -187,7 +187,7 @@ public class EntityArrow extends Entity {
damagesource = DamageSource.arrow(this, this.shooter);
}
if (this.isBurning() && this.world.pvpMode) { // CraftBukkit - abide by pvp setting.
if (this.isBurning() && (!(movingobjectposition.entity instanceof EntityPlayer) || this.world.pvpMode)) { // CraftBukkit - abide by pvp setting if destination is a player.
// CraftBukkit start
EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), 5);
Bukkit.getPluginManager().callEvent(combustEvent);