summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2013-12-20 15:33:06 -0500
committerEvilSeph <evilseph@gmail.com>2013-12-20 15:33:06 -0500
commit6d9a6fbb4bfe2d1aa9c28440f7951b53573bb505 (patch)
tree0e76245c75889f8765a4ee04886ebccae5eca1fb /src
parent330dbbf78c4b40390851f3d73c1637da4b22285c (diff)
downloadcraftbukkit-6d9a6fbb4bfe2d1aa9c28440f7951b53573bb505.tar
craftbukkit-6d9a6fbb4bfe2d1aa9c28440f7951b53573bb505.tar.gz
craftbukkit-6d9a6fbb4bfe2d1aa9c28440f7951b53573bb505.tar.lz
craftbukkit-6d9a6fbb4bfe2d1aa9c28440f7951b53573bb505.tar.xz
craftbukkit-6d9a6fbb4bfe2d1aa9c28440f7951b53573bb505.zip
Fix attributes not clearing on death. Fixes BUKKIT-5213
Due to an incorrect mapping of this method to a friendly name, we're unfortunately calling the wrong method within EntityPlayer.reset() to reset attributes. Instead of what we've mapped as "removeAllEffects", we should be calling EntityLiving.aP(). This mapping should be corrected in the next naming version.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/EntityPlayer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 42fa9e0a..1dee8b2b 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1029,7 +1029,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.expTotal = this.newTotalExp;
this.exp = 0;
this.deathTicks = 0;
- this.removeAllEffects();
+ this.aP(); // Should be remapped: removeAllEffects should be remapped to this.
this.updateEffects = true;
this.activeContainer = this.defaultContainer;
this.killer = null;