summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityPotion.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityPotion.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityPotion.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java
index c166c5d3..06addec8 100644
--- a/src/main/java/net/minecraft/server/EntityPotion.java
+++ b/src/main/java/net/minecraft/server/EntityPotion.java
@@ -43,7 +43,7 @@ public class EntityPotion extends EntityProjectile {
return -20.0F;
}
- public int f() {
+ public int getPotionValue() {
return this.d;
}
@@ -100,8 +100,9 @@ public class EntityPotion extends EntityProjectile {
}
// CraftBukkit end
- if (MobEffectList.byId[i].b()) {
- MobEffectList.byId[i].a(this.shooter, (EntityLiving) entity, mobeffect.getAmplifier(), d1, this); // CraftBukkit - added 'this'
+ if (MobEffectList.byId[i].isInstant()) {
+ // CraftBukkit - added 'this'
+ MobEffectList.byId[i].applyInstantEffect(this.shooter, (EntityLiving) entity, mobeffect.getAmplifier(), d1, this);
} else {
int j = (int) (d1 * (double) mobeffect.getDuration() + 0.5D);
@@ -115,7 +116,7 @@ public class EntityPotion extends EntityProjectile {
}
}
- this.world.f(2002, (int) Math.round(this.locX), (int) Math.round(this.locY), (int) Math.round(this.locZ), this.d);
+ this.world.triggerEffect(2002, (int) Math.round(this.locX), (int) Math.round(this.locY), (int) Math.round(this.locZ), this.d);
this.die();
}
}