Merge pull request #54 from mrapple/master

Add a fix for clearing potion effects on respawn
This commit is contained in:
md-5 2013-10-02 00:32:30 -07:00
commit f79333c2dc

View file

@ -0,0 +1,22 @@
From 1bae811fba2af5397d2702480779e29089ff37a9 Mon Sep 17 00:00:00 2001
From: mrapple <tony@oc.tc>
Date: Tue, 1 Oct 2013 21:10:50 -0500
Subject: [PATCH] Fix clearing potion effects on respawn -- missed rename
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index fd49c80..54dad5c 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -968,7 +968,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.expTotal = this.newTotalExp;
this.exp = 0;
this.deathTicks = 0;
- this.aJ(); // Should be removeAllEffects.
+ this.aK(); // Should be removeAllEffects.
this.updateEffects = true;
this.activeContainer = this.defaultContainer;
this.killer = null;
--
1.7.12.4 (Apple Git-37)