From ef256e53ebc9123a2eb66b50157fc151f3b1949d Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Sun, 13 Jun 2021 13:55:11 -0400
Subject: [PATCH] v0.9.3a: adjusted when the spirit hawk dies to to timer
 expiry

---
 .../actors/hero/abilities/huntress/SpiritHawk.java         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/SpiritHawk.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/SpiritHawk.java
index c57ad5e52..f0acf0705 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/SpiritHawk.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/SpiritHawk.java
@@ -186,6 +186,10 @@ public class SpiritHawk extends ArmorAbility {
 
 		@Override
 		protected boolean act() {
+			if (timeRemaining <= 0){
+				die(null);
+				return true;
+			}
 			viewDistance = (int)GameMath.gate(6, 6+Dungeon.hero.pointsInTalent(Talent.EAGLE_EYE), 8);
 			baseSpeed = 2f + Dungeon.hero.pointsInTalent(Talent.SWIFT_SPIRIT)/2f;
 			boolean result = super.act();
@@ -198,9 +202,6 @@ public class SpiritHawk extends ArmorAbility {
 		protected void spend(float time) {
 			super.spend(time);
 			timeRemaining -= time;
-			if (timeRemaining <= 0){
-				die(null);
-			}
 		}
 
 		@Override