From 6d9a6fbb4bfe2d1aa9c28440f7951b53573bb505 Mon Sep 17 00:00:00 2001 From: EvilSeph Date: Fri, 20 Dec 2013 15:33:06 -0500 Subject: [PATCH] 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. --- src/main/java/net/minecraft/server/EntityPlayer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 42fa9e0a4a..1dee8b2bed 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;