summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityArrow.java
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2012-02-08 19:06:09 -0500
committerEvilSeph <evilseph@gmail.com>2012-02-08 19:06:09 -0500
commitae333ded91b83fddf5c5695032bbda8099a092d8 (patch)
treee763a89b7e955865397a986df7b3885ba75510b9 /src/main/java/net/minecraft/server/EntityArrow.java
parent879a87b1e0b7b68a932ba755eba769ff7aa73843 (diff)
downloadcraftbukkit-ae333ded91b83fddf5c5695032bbda8099a092d8.tar
craftbukkit-ae333ded91b83fddf5c5695032bbda8099a092d8.tar.gz
craftbukkit-ae333ded91b83fddf5c5695032bbda8099a092d8.tar.lz
craftbukkit-ae333ded91b83fddf5c5695032bbda8099a092d8.tar.xz
craftbukkit-ae333ded91b83fddf5c5695032bbda8099a092d8.zip
Made flaming arrows respect PVP settings. Fixes BUKKIT-541
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityArrow.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityArrow.java2
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 38eee3f5..6124c651 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -188,7 +188,7 @@ public class EntityArrow extends Entity {
damagesource = DamageSource.arrow(this, this.shooter);
}
- if (this.isBurning()) {
+ if (this.isBurning() && this.world.pvpMode) { // CraftBukkit - abide by pvp setting.
// CraftBukkit start
EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), 5);
Bukkit.getPluginManager().callEvent(combustEvent);