diff options
Diffstat (limited to 'src/main/java/net/minecraft')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityPotion.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java index 3641e52f..c166c5d3 100644 --- a/src/main/java/net/minecraft/server/EntityPotion.java +++ b/src/main/java/net/minecraft/server/EntityPotion.java @@ -93,6 +93,13 @@ public class EntityPotion extends EntityProjectile { MobEffect mobeffect = (MobEffect) iterator1.next(); int i = mobeffect.getEffectId(); + // CraftBukkit start - abide by PVP settings + if (!this.world.pvpMode && entity instanceof EntityPlayer && entity != this.shooter) { + // 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; + } + // CraftBukkit end + if (MobEffectList.byId[i].b()) { MobEffectList.byId[i].a(this.shooter, (EntityLiving) entity, mobeffect.getAmplifier(), d1, this); // CraftBukkit - added 'this' } else { |