From a3d7fd1c3842b20a84f2a2062fe0ffd28d9122ce Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Mon, 8 Dec 2025 11:57:25 -0500
Subject: [PATCH] v3.3.1: fixed feint afterimage lasting longer than 1 turn in
 some cases

---
 .../actors/hero/abilities/duelist/Feint.java         | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/duelist/Feint.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/duelist/Feint.java
index 6c3949acd..26ebf87d3 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/duelist/Feint.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/duelist/Feint.java
@@ -111,13 +111,15 @@ public class Feint extends ArmorAbility {
 				hero.pos = target;
 				Dungeon.level.occupyCell(hero);
 				Invisibility.dispel();
-				hero.spendAndNext(1f);
+				hero.next();
 			}
 		});
+		hero.spend(1f);
 
 		AfterImage image = new AfterImage();
 		image.pos = hero.pos;
-		GameScene.add(image, 1);
+		GameScene.add(image);
+		image.syncToHero(hero);
 
 		int imageAttackPos;
 		Char enemyTarget = TargetHealthIndicator.instance.target();
@@ -194,6 +196,12 @@ public class Feint extends ArmorAbility {
 			return true;
 		}
 
+		public void syncToHero(Hero hero){
+			if (cooldown() != hero.cooldown()){
+				spendConstant(hero.cooldown() - cooldown());
+			}
+		}
+
 		@Override
 		public void damage( int dmg, Object src ) {