From 7195d81d7b18e9333ec8e2805a696d67e66ef41d Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Tue, 26 Mar 2024 16:10:56 -0400
Subject: [PATCH] v2.4.0: added a check to prevent actor processing after scene
 change

---
 SPD-classes/src/main/java/com/watabou/noosa/Game.java         | 4 ++++
 .../shatteredpixel/shatteredpixeldungeon/actors/Actor.java    | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/SPD-classes/src/main/java/com/watabou/noosa/Game.java b/SPD-classes/src/main/java/com/watabou/noosa/Game.java
index 051faa822..7a03be3cd 100644
--- a/SPD-classes/src/main/java/com/watabou/noosa/Game.java
+++ b/SPD-classes/src/main/java/com/watabou/noosa/Game.java
@@ -232,6 +232,10 @@ public class Game implements ApplicationListener {
 	public static Scene scene() {
 		return instance.scene;
 	}
+
+	public static boolean switchingScene() {
+		return instance.requestedReset;
+	}
 	
 	protected void step() {
 		
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java
index e738fbac3..413800cf5 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java
@@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Statistics;
 import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
+import com.watabou.noosa.Game;
 import com.watabou.utils.Bundlable;
 import com.watabou.utils.Bundle;
 import com.watabou.utils.SparseArray;
@@ -242,7 +243,7 @@ public abstract class Actor implements Bundlable {
 		do {
 			
 			current = null;
-			if (!interrupted) {
+			if (!interrupted && !Game.switchingScene()) {
 				float earliest = Float.MAX_VALUE;
 
 				for (Actor actor : all) {