From d6fdccd21f4eaa164d7b313fe8602682275fe7ee Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 6 Nov 2016 16:41:48 -0500 Subject: [PATCH] v0.4.3c: fixed additional bugs with the berserker passive buff --- .../shatteredpixeldungeon/actors/hero/Hero.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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 d3fd2c300..f0050657a 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 @@ -965,6 +965,10 @@ public class Hero extends Char { dmg -= Random.NormalIntRange(belongings.armor.DRMin(), belongings.armor.DRMax())/2; } + if (subClass == HeroSubClass.BERSERKER && berserk == null){ + berserk = Buff.affect(this, Berserk.class); + } + super.damage( dmg, src ); } @@ -1393,9 +1397,10 @@ public class Hero extends Char { @Override public boolean isAlive() { - if (subClass == HeroSubClass.BERSERKER){ - if (berserk == null) berserk = Buff.affect(this, Berserk.class); - if (berserk.berserking()) return true; + if (subClass == HeroSubClass.BERSERKER + && berserk != null + && berserk.berserking()){ + return true; } return super.isAlive(); }