From 5e838b4d99b70d898c7701e8511bcd1236553e55 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Tue, 30 Aug 2022 13:16:54 -0400
Subject: [PATCH] v1.4.0: berserking recovery now accounts for locked floor
 regen timer

---
 .../shatteredpixeldungeon/actors/buffs/Berserk.java            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 6bcd61aa9..9ea80ddd9 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
@@ -142,7 +142,8 @@ public class Berserk extends Buff implements ActionIndicator.Action {
 					detach();
 				}
 			}
-		} else if (state == State.RECOVERING && levelRecovery == 0){
+		} else if (state == State.RECOVERING && levelRecovery == 0
+				&& (target.buff(LockedFloor.class) == null || target.buff(LockedFloor.class).regenOn())){
 			turnRecovery--;
 			if (turnRecovery <= 0){
 				turnRecovery = 0;