summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfeildmaster <admin@feildmaster.com>2012-11-27 12:14:53 -0600
committerfeildmaster <admin@feildmaster.com>2012-11-27 12:14:53 -0600
commit0c16afd6e06742c47cae4141f694a9707aadac0b (patch)
tree28e4d8c5da222674bdfa183846e114c5cc709c75
parent1040a81334594d6f6585849e5c6abefa6a725255 (diff)
downloadcraftbukkit-0c16afd6e06742c47cae4141f694a9707aadac0b.tar
craftbukkit-0c16afd6e06742c47cae4141f694a9707aadac0b.tar.gz
craftbukkit-0c16afd6e06742c47cae4141f694a9707aadac0b.tar.lz
craftbukkit-0c16afd6e06742c47cae4141f694a9707aadac0b.tar.xz
craftbukkit-0c16afd6e06742c47cae4141f694a9707aadac0b.zip
Take into account if the shooter is a player before considering pvp mode for projectiles. Fixes BUKKIT-3058
-rw-r--r--src/main/java/net/minecraft/server/EntityArrow.java2
-rw-r--r--src/main/java/net/minecraft/server/EntityPotion.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index 8963e1c3..8b39b7ba 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -219,7 +219,7 @@ public class EntityArrow extends Entity implements IProjectile {
// CraftBukkit start - moved damage call
if (movingobjectposition.entity.damageEntity(damagesource, i1)) {
- if (this.isBurning() && (!(movingobjectposition.entity instanceof EntityPlayer) || this.world.pvpMode)) { // CraftBukkit - abide by pvp setting if destination is a player.
+ if (this.isBurning() && (!(movingobjectposition.entity instanceof EntityPlayer) || !(this.shooter instanceof EntityPlayer) || this.world.pvpMode)) { // CraftBukkit - abide by pvp setting if destination is a player.
EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), 5);
org.bukkit.Bukkit.getPluginManager().callEvent(combustEvent);
diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java
index f205d74f..cf734a1b 100644
--- a/src/main/java/net/minecraft/server/EntityPotion.java
+++ b/src/main/java/net/minecraft/server/EntityPotion.java
@@ -107,8 +107,8 @@ public class EntityPotion extends EntityProjectile {
MobEffect mobeffect = (MobEffect) iterator1.next();
int i = mobeffect.getEffectId();
- // CraftBukkit start - abide by PVP settings
- if (!this.world.pvpMode && entityliving instanceof EntityPlayer && entityliving != this.getShooter()) {
+ // CraftBukkit start - abide by PVP settings - for players only!
+ if (!this.world.pvpMode && this.getShooter() instanceof EntityPlayer && entityliving instanceof EntityPlayer && entityliving != this.getShooter()) {
// Block SLOWER_MOVEMENT, SLOWER_DIG, HARM, BLINDNESS, HUNGER, WEAKNESS and POISON potions
if (i == 2 || i == 4 || i == 7 || i == 15 || i == 17 || i == 18 || i == 19) continue;
}