diff options
| author | steffen <steffenb198@aol.com> | 2012-02-19 11:59:43 +0100 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-02-24 16:58:39 -0500 |
| commit | 2887f99fe51014d4c6af7b9211042f42abdeaa22 (patch) | |
| tree | b6462882391da5f88d685bef92b7262b01717dbf /src/main/java/net/minecraft/server | |
| parent | a7f0b70a3a4428b25eabf7ce3c943910b7b6487a (diff) | |
| download | craftbukkit-2887f99fe51014d4c6af7b9211042f42abdeaa22.tar craftbukkit-2887f99fe51014d4c6af7b9211042f42abdeaa22.tar.gz craftbukkit-2887f99fe51014d4c6af7b9211042f42abdeaa22.tar.lz craftbukkit-2887f99fe51014d4c6af7b9211042f42abdeaa22.tar.xz craftbukkit-2887f99fe51014d4c6af7b9211042f42abdeaa22.zip | |
Fixed EntityArrow just to use the PVP setting if the destination is a
Player. Fixes BUKKIT-803
Diffstat (limited to 'src/main/java/net/minecraft/server')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityArrow.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java index a1b899a9..2a9bc1ed 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); |