Paper/nms-patches/EntityPotion.patch

110 lines
5.3 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityPotion.java
+++ b/net/minecraft/server/EntityPotion.java
2018-07-15 02:00:00 +02:00
@@ -5,6 +5,12 @@
import java.util.function.Predicate;
2016-02-29 22:32:46 +01:00
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+// CraftBukkit start
+import java.util.HashMap;
2016-11-17 02:41:03 +01:00
+import java.util.Map;
+import org.bukkit.craftbukkit.entity.CraftLivingEntity;
+import org.bukkit.entity.LivingEntity;
+// CraftBukkit end
2016-11-17 02:41:03 +01:00
public class EntityPotion extends EntityProjectile {
2018-07-15 02:00:00 +02:00
@@ -77,7 +83,7 @@
2016-11-17 02:41:03 +01:00
if (flag) {
2018-07-15 02:00:00 +02:00
this.l();
2016-11-17 02:41:03 +01:00
- } 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 {
2018-07-15 02:00:00 +02:00
@@ -114,6 +120,7 @@
2016-11-17 02:41:03 +01:00
private void a(MovingObjectPosition movingobjectposition, List<MobEffect> list) {
AxisAlignedBB axisalignedbb = this.getBoundingBox().grow(4.0D, 2.0D, 4.0D);
2018-12-25 22:00:00 +01:00
List<EntityLiving> list1 = this.world.a(EntityLiving.class, axisalignedbb);
2016-11-17 02:41:03 +01:00
+ Map<LivingEntity, Double> affected = new HashMap<LivingEntity, Double>(); // CraftBukkit
2016-11-17 02:41:03 +01:00
if (!list1.isEmpty()) {
Iterator iterator = list1.iterator();
2018-07-15 02:00:00 +02:00
@@ -131,21 +138,46 @@
2016-11-17 02:41:03 +01:00
d1 = 1.0D;
}
2015-02-26 23:41:06 +01:00
2016-11-17 02:41:03 +01:00
- Iterator iterator1 = list.iterator();
+ // CraftBukkit start
2016-11-17 02:41:03 +01:00
+ affected.put((LivingEntity) entityliving.getBukkitEntity(), d1);
+ }
+ }
+ }
+ }
2015-02-26 23:41:06 +01:00
+
2016-11-17 02:41:03 +01:00
+ 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;
+ }
2016-03-20 03:42:12 +01:00
2016-11-17 02:41:03 +01:00
- while (iterator1.hasNext()) {
- MobEffect mobeffect = (MobEffect) iterator1.next();
- MobEffectList mobeffectlist = mobeffect.getMobEffect();
2016-03-20 03:42:12 +01:00
-
2016-11-17 02:41:03 +01:00
- if (mobeffectlist.isInstant()) {
- mobeffectlist.applyInstantEffect(this, this.getShooter(), entityliving, mobeffect.getAmplifier(), d1);
- } else {
- int i = (int) (d1 * (double) mobeffect.getDuration() + 0.5D);
2016-03-20 03:42:12 +01:00
-
2016-11-17 02:41:03 +01:00
- if (i > 20) {
- entityliving.addEffect(new MobEffect(mobeffectlist, i, mobeffect.getAmplifier(), mobeffect.isAmbient(), mobeffect.isShowParticles()));
- }
- }
+ EntityLiving entityliving = ((CraftLivingEntity) victim).getHandle();
+ double d1 = event.getIntensity(victim);
+ // CraftBukkit end
+
2016-11-17 02:41:03 +01:00
+ Iterator iterator1 = list.iterator();
2015-02-26 23:41:06 +01:00
+
2016-11-17 02:41:03 +01:00
+ 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
2016-02-29 22:32:46 +01:00
+
2016-11-17 02:41:03 +01:00
+ if (mobeffectlist.isInstant()) {
+ mobeffectlist.applyInstantEffect(this, this.getShooter(), entityliving, mobeffect.getAmplifier(), d1);
+ } else {
+ int i = (int) (d1 * (double) mobeffect.getDuration() + 0.5D);
2016-03-20 03:42:12 +01:00
+
2016-11-17 02:41:03 +01:00
+ if (i > 20) {
+ entityliving.addEffect(new MobEffect(mobeffectlist, i, mobeffect.getAmplifier(), mobeffect.isAmbient(), mobeffect.isShowParticles()), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.POTION_SPLASH); // CraftBukkit
2016-02-29 22:32:46 +01:00
}
}
}
2018-07-15 02:00:00 +02:00
@@ -177,7 +209,14 @@
2016-12-20 21:00:00 +01:00
entityareaeffectcloud.setColor(nbttagcompound.getInt("CustomPotionColor"));
}
2016-11-17 02:41:03 +01:00
- 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() {