mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-22 08:15:05 +01:00
Fixed EntityArrow just to use the PVP setting if the destination is a
Player. Fixes BUKKIT-803
This commit is contained in:
parent
a7f0b70a3a
commit
2887f99fe5
1 changed files with 1 additions and 1 deletions
|
@ -187,7 +187,7 @@ public class EntityArrow extends Entity {
|
||||||
damagesource = DamageSource.arrow(this, this.shooter);
|
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
|
// CraftBukkit start
|
||||||
EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), 5);
|
EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), 5);
|
||||||
Bukkit.getPluginManager().callEvent(combustEvent);
|
Bukkit.getPluginManager().callEvent(combustEvent);
|
||||||
|
|
Loading…
Add table
Reference in a new issue