From 2887f99fe51014d4c6af7b9211042f42abdeaa22 Mon Sep 17 00:00:00 2001 From: steffen Date: Sun, 19 Feb 2012 11:59:43 +0100 Subject: [PATCH] Fixed EntityArrow just to use the PVP setting if the destination is a Player. Fixes BUKKIT-803 --- src/main/java/net/minecraft/server/EntityArrow.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java index a1b899a91b..2a9bc1ed99 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -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);