Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-17 17:31:06 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Player. Fixes BUKKIT-803
This commit is contained in:
steffen 2012-02-19 11:59:43 +01:00 committed by EvilSeph
parent a7f0b70a3a
commit 2887f99fe5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/server/EntityArrow.java
View File

@ -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);