From 248648e2bb3b6f68da0e0688b9b65eeb4f251bcd Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Tue, 15 Dec 2020 18:47:04 -0500
Subject: [PATCH] v0.9.1a: fixed errors with AI target swapping

---
 .../shatteredpixeldungeon/actors/mobs/Mob.java             | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java
index f87abac49..a671f7a1b 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java
@@ -930,9 +930,10 @@ public abstract class Mob extends Char {
 					//if moving towards an enemy isn't possible, try to switch targets to another enemy that is closer
 					//unless we have already done that and still can't move toward them, then move on.
 					if (!recursing) {
-						Char newEnemy = chooseEnemy();
-						if (newEnemy != null && enemy != newEnemy) {
-							enemy = newEnemy;
+						Char oldEnemy = enemy;
+						enemy = null;
+						enemy = chooseEnemy();
+						if (enemy != null && enemy != oldEnemy) {
 							recursing = true;
 							boolean result = act(enemyInFOV, justAlerted);
 							recursing = false;