summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNate Mortensen <nate.richard.mortensen@gmail.com>2014-03-23 20:50:43 -0600
committerNate Mortensen <nate.richard.mortensen@gmail.com>2014-03-23 21:25:14 -0600
commitd51463d162659f202aad16c3ba71062c47495243 (patch)
treec3190613a70387aafbd8b259f37eba6103b0420a /src
parent58267995ebddda5de89f1aa55aab5fb22ad41b7c (diff)
downloadcraftbukkit-d51463d162659f202aad16c3ba71062c47495243.tar
craftbukkit-d51463d162659f202aad16c3ba71062c47495243.tar.gz
craftbukkit-d51463d162659f202aad16c3ba71062c47495243.tar.lz
craftbukkit-d51463d162659f202aad16c3ba71062c47495243.tar.xz
craftbukkit-d51463d162659f202aad16c3ba71062c47495243.zip
Fix PotionEffect removal.
The method in EntityLiving to remove a potion effect was remapped during the 1.7.5 update. The method invocation in CraftLivingEntity was not updated to invoke the remapped method, which has led to a random method in LivingEntity being called in its place. This commit corrects the behavior of removePotionEffect by changing the method to invoke the remapped method as opposed to EntityLiving#m(float). Thanks to @gabizou for finding this issue.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index c1f17829..03a56270 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -280,7 +280,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
}
public void removePotionEffect(PotionEffectType type) {
- getHandle().m(type.getId()); // Should be removeEffect.
+ getHandle().removeEffect(type.getId());
}
public Collection<PotionEffect> getActivePotionEffects() {