13
0
geforkt von Mirrors/Paper

Made splash options abide by PVP settings. Fixes BUKKIT-542

Dieser Commit ist enthalten in:
EvilSeph 2012-02-08 21:02:18 -05:00
Ursprung f52665348e
Commit da1aead88a

Datei anzeigen

@ -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 {