konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.4.0: added a check to prevent actor processing after scene change

Browse Source
This commit is contained in:
Evan Debenham
2024-03-26 16:10:56 -04:00
parent ec165ecbe7
commit 7195d81d7b
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SPD-classes/src/main/java/com/watabou/noosa/Game.java
View File

@@ -232,6 +232,10 @@ public class Game implements ApplicationListener {
public static Scene scene() { public static Scene scene() {
return instance.scene; return instance.scene;
} }
public static boolean switchingScene() {
return instance.requestedReset;
}
protected void step() { protected void step() {

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java
View File

@@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Statistics;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.watabou.noosa.Game;
import com.watabou.utils.Bundlable; import com.watabou.utils.Bundlable;
import com.watabou.utils.Bundle; import com.watabou.utils.Bundle;
import com.watabou.utils.SparseArray; import com.watabou.utils.SparseArray;
@@ -242,7 +243,7 @@ public abstract class Actor implements Bundlable {
do { do {
current = null; current = null;
if (!interrupted) { if (!interrupted && !Game.switchingScene()) {
float earliest = Float.MAX_VALUE; float earliest = Float.MAX_VALUE;
for (Actor actor : all) { for (Actor actor : all) {