Fix potion effects not being reset on death. Fixes

BUKKIT-4515

CraftBukkit-Patches/0065-Fix-StructureGrowEvent.getPlayer.patch

@@ -1,9 +1,10 @@
-From 82c0825e94c0fbd1ef2e8eb8664c51158f7d8265 Mon Sep 17 00:00:00 2001
+From a2e7aa0a3718a82ab062a2101232b24bea51bcc2 Mon Sep 17 00:00:00 2001
 From: ItsHarry <info@itsjerryandharry.com>
 Date: Wed, 10 Jul 2013 13:45:08 +0200
-Subject: [PATCH] Fixes StructureGrowEvent.getPlayer(); always returning null
- regardless of whether bonemeal was used or not.
+Subject: [PATCH] Fix StructureGrowEvent.getPlayer()
 
+Fixes StructureGrowEvent.getPlayer(); always returning null regardless of whether
+ bonemeal was used or not.
 
 diff --git a/src/main/java/net/minecraft/server/ItemDye.java b/src/main/java/net/minecraft/server/ItemDye.java
 index d0ffd84..3a98903 100644
@@ -19,5 +20,5 @@ index d0ffd84..3a98903 100644
                          world.triggerEffect(2005, i, j, k, 0);
                      }
 -- 
-1.8.3.msysgit.0
+1.8.1.2
 

CraftBukkit-Patches/0067-Fix-potion-effects-not-being-reset-on-death.patch

@@ -0,0 +1,23 @@
+From cc21d7cb9d61eee4efef76e59a04257f1690c90e Mon Sep 17 00:00:00 2001
+From: MonsieurApple <tony@oc.tc>
+Date: Tue, 9 Jul 2013 09:48:49 -0500
+Subject: [PATCH] Fix potion effects not being reset on death
+
+Fix potion effects not being reset on death. Fixes BUKKIT-4515
+
+diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
+index 55a0612..5c9babf 100644
+--- a/src/main/java/net/minecraft/server/EntityPlayer.java
++++ b/src/main/java/net/minecraft/server/EntityPlayer.java
+@@ -922,7 +922,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+         this.expTotal = this.newTotalExp;
+         this.exp = 0;
+         this.deathTicks = 0;
+-        this.aG(); // Should be removeAllEffects.
++        this.aJ(); // Should be removeAllEffects.
+         this.updateEffects = true;
+         this.activeContainer = this.defaultContainer;
+         this.killer = null;
+-- 
+1.8.1.2
+