From a7b3e4ca54478a07f173ac2610e3359881bfb7ed Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Tue, 7 Mar 2017 16:03:43 -0500
Subject: [PATCH] v0.6.0: fixed berserk buff not interacting correctly with
 blessed ankhs

---
 .../shatteredpixeldungeon/actors/buffs/Berserk.java            | 2 +-
 .../shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java
index 94e44e9de..45af9fd18 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java
@@ -120,7 +120,7 @@ public class Berserk extends Buff {
 
 		}
 
-		return state == State.BERSERK && target.SHLD > 0;
+		return state == State.BERSERK;
 	}
 
 	public void recover(float percent){
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
index a4d5fb170..130216bac 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
@@ -1403,7 +1403,8 @@ public class Hero extends Char {
 	public boolean isAlive() {
 		if (subClass == HeroSubClass.BERSERKER
 				&& berserk != null
-				&& berserk.berserking()){
+				&& berserk.berserking()
+				&& SHLD > 0){
 			return true;
 		}
 		return super.isAlive();