--- a/net/minecraft/server/EntityPotion.java +++ b/net/minecraft/server/EntityPotion.java @@ -4,6 +4,13 @@ import java.util.List; import java.util.function.Predicate; import javax.annotation.Nullable; +// CraftBukkit start +import java.util.HashMap; +import java.util.Map; +import org.bukkit.craftbukkit.entity.CraftLivingEntity; +import org.bukkit.craftbukkit.event.CraftEventFactory; +import org.bukkit.entity.LivingEntity; +// CraftBukkit end public class EntityPotion extends EntityProjectileThrowable { @@ -69,7 +76,7 @@ if (flag) { this.splash(); - } else if (!list.isEmpty()) { + } else if (true || !list.isEmpty()) { // CraftBukkit - Call event even if no effects to apply if (this.isLingering()) { this.a(itemstack, potionregistry); } else { @@ -106,6 +113,7 @@ private void a(List<MobEffect> list, @Nullable Entity entity) { AxisAlignedBB axisalignedbb = this.getBoundingBox().grow(4.0D, 2.0D, 4.0D); List<EntityLiving> list1 = this.world.a(EntityLiving.class, axisalignedbb); + Map<LivingEntity, Double> affected = new HashMap<LivingEntity, Double>(); // CraftBukkit if (!list1.isEmpty()) { Iterator iterator = list1.iterator(); @@ -123,21 +131,46 @@ d1 = 1.0D; } - Iterator iterator1 = list.iterator(); + // CraftBukkit start + affected.put((LivingEntity) entityliving.getBukkitEntity(), d1); + } + } + } + } - while (iterator1.hasNext()) { - MobEffect mobeffect = (MobEffect) iterator1.next(); - MobEffectList mobeffectlist = mobeffect.getMobEffect(); - - if (mobeffectlist.isInstant()) { - mobeffectlist.applyInstantEffect(this, this.getShooter(), entityliving, mobeffect.getAmplifier(), d1); - } else { - int i = (int) (d1 * (double) mobeffect.getDuration() + 0.5D); - - if (i > 20) { - entityliving.addEffect(new MobEffect(mobeffectlist, i, mobeffect.getAmplifier(), mobeffect.isAmbient(), mobeffect.isShowParticles())); - } - } + org.bukkit.event.entity.PotionSplashEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPotionSplashEvent(this, affected); + if (!event.isCancelled() && list != null && !list.isEmpty()) { // do not process effects if there are no effects to process + for (LivingEntity victim : event.getAffectedEntities()) { + if (!(victim instanceof CraftLivingEntity)) { + continue; + } + + EntityLiving entityliving = ((CraftLivingEntity) victim).getHandle(); + double d1 = event.getIntensity(victim); + // CraftBukkit end + + Iterator iterator1 = list.iterator(); + + while (iterator1.hasNext()) { + MobEffect mobeffect = (MobEffect) iterator1.next(); + MobEffectList mobeffectlist = mobeffect.getMobEffect(); + // CraftBukkit start - Abide by PVP settings - for players only! + if (!this.world.pvpMode && this.getShooter() instanceof EntityPlayer && entityliving instanceof EntityPlayer && entityliving != this.getShooter()) { + int i = MobEffectList.getId(mobeffectlist); + // 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.isInstant()) { + mobeffectlist.applyInstantEffect(this, this.getShooter(), entityliving, mobeffect.getAmplifier(), d1); + } else { + int i = (int) (d1 * (double) mobeffect.getDuration() + 0.5D); + + if (i > 20) { + entityliving.addEffect(new MobEffect(mobeffectlist, i, mobeffect.getAmplifier(), mobeffect.isAmbient(), mobeffect.isShowParticles()), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.POTION_SPLASH); // CraftBukkit } } } @@ -173,7 +206,14 @@ entityareaeffectcloud.setColor(nbttagcompound.getInt("CustomPotionColor")); } - this.world.addEntity(entityareaeffectcloud); + // CraftBukkit start + org.bukkit.event.entity.LingeringPotionSplashEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callLingeringPotionSplashEvent(this, entityareaeffectcloud); + if (!(event.isCancelled() || entityareaeffectcloud.dead)) { + this.world.addEntity(entityareaeffectcloud); + } else { + entityareaeffectcloud.dead = true; + } + // CraftBukkit end } public boolean isLingering() { @@ -184,11 +224,19 @@ IBlockData iblockdata = this.world.getType(blockposition); if (iblockdata.a((Tag) TagsBlock.FIRE)) { - this.world.a(blockposition, false); + // CraftBukkit start + if (!CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, Blocks.AIR.getBlockData()).isCancelled()) { + this.world.a(blockposition, false); + } + // CraftBukkit end } else if (BlockCampfire.g(iblockdata)) { - this.world.a((EntityHuman) null, 1009, blockposition, 0); - BlockCampfire.c((GeneratorAccess) this.world, blockposition, iblockdata); - this.world.setTypeUpdate(blockposition, (IBlockData) iblockdata.set(BlockCampfire.b, false)); + // CraftBukkit start + if (!CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, iblockdata.set(BlockCampfire.b, false)).isCancelled()) { // PAIL rename LIT + this.world.a((EntityHuman) null, 1009, blockposition, 0); + BlockCampfire.c((GeneratorAccess) this.world, blockposition, iblockdata); + this.world.setTypeUpdate(blockposition, (IBlockData) iblockdata.set(BlockCampfire.b, false)); + } + // CraftBukkit end } }