From fa2e63a529a81b4ce3cec923598abd2eef4da0a6 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Fri, 11 Jun 2021 20:45:19 -0400
Subject: [PATCH] v0.9.3a: reverted attack indicator changes due to deadlock
 concerns

---
 .../ui/AttackIndicator.java                   | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java
index 3a8993223..c026d7abf 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java
@@ -30,6 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
 import com.watabou.input.GameAction;
 import com.watabou.noosa.Game;
 import com.watabou.utils.Random;
+import com.watabou.utils.Reflection;
 
 import java.util.ArrayList;
 
@@ -81,18 +82,11 @@ public class AttackIndicator extends Tag {
 			PixelScene.align(sprite);
 		}
 	}
-
-	private boolean needsImageUpdate = false;
 	
 	@Override
 	public synchronized void update() {
 		super.update();
 
-		if (needsImageUpdate){
-			updateImage();
-			needsImageUpdate = false;
-		}
-
 		if (!bg.visible){
 			enable(false);
 			if (delay > 0f) delay -= Game.elapsed;
@@ -129,7 +123,7 @@ public class AttackIndicator extends Tag {
 			} else {
 				active = true;
 				lastTarget = Random.element( candidates );
-				needsImageUpdate = true;
+				updateImage();
 				flash();
 			}
 		} else {
@@ -149,16 +143,14 @@ public class AttackIndicator extends Tag {
 			sprite.killAndErase();
 			sprite = null;
 		}
-
-		if (lastTarget != null) {
-			sprite = lastTarget.sprite();
-			active = true;
-			sprite.linkVisuals(lastTarget);
-			sprite.idle();
-			sprite.paused = true;
-			sprite.visible = bg.visible;
-			add(sprite);
-		}
+		
+		sprite = Reflection.newInstance(lastTarget.spriteClass);
+		active = true;
+		sprite.linkVisuals(lastTarget);
+		sprite.idle();
+		sprite.paused = true;
+		sprite.visible = bg.visible;
+		add( sprite );
 
 		layout();
 	}
@@ -190,7 +182,7 @@ public class AttackIndicator extends Tag {
 	public static void target( Char target ) {
 		synchronized (instance) {
 			instance.lastTarget = (Mob) target;
-			instance.needsImageUpdate = true;
+			instance.updateImage();
 
 			TargetHealthIndicator.instance.target(target);
 		}