LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.8.0: fixed thread issues caused by actor thread now being ended

Browse Source
This commit is contained in:
Evan Debenham 2019-11-15 18:33:13 -05:00
parent c68f27c774
commit 1d7bf8cfc9
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
View File

@ -506,7 +506,7 @@ public class GameScene extends PixelScene {
} }
public static void endActorThread(){ public static void endActorThread(){
if (actorThread.isAlive()){ if (actorThread != null && actorThread.isAlive()){
Actor.keepActorThreadAlive = false; Actor.keepActorThreadAlive = false;
actorThread.interrupt(); actorThread.interrupt();
} }
@ -523,12 +523,7 @@ public class GameScene extends PixelScene {
} }
} }
private static final Thread actorThread = new Thread() { private static Thread actorThread;
@Override
public void run() {
Actor.process();
}
};
//sometimes UI changes can be prompted by the actor thread. //sometimes UI changes can be prompted by the actor thread.
// We queue any removed element destruction, rather than destroying them in the actor thread. // We queue any removed element destruction, rather than destroying them in the actor thread.
@ -545,13 +540,22 @@ public class GameScene extends PixelScene {
if (!freezeEmitters) water.offset( 0, -5 * Game.elapsed ); if (!freezeEmitters) water.offset( 0, -5 * Game.elapsed );
if (!Actor.processing() && Dungeon.hero.isAlive()) { if (!Actor.processing() && Dungeon.hero.isAlive()) {
if (!actorThread.isAlive()) { if (actorThread == null || !actorThread.isAlive()) {
actorThread = new Thread() {
@Override
public void run() {
Actor.process();
}
};
//if cpu cores are limited, game should prefer drawing the current frame //if cpu cores are limited, game should prefer drawing the current frame
if (Runtime.getRuntime().availableProcessors() == 1) { if (Runtime.getRuntime().availableProcessors() == 1) {
actorThread.setPriority(Thread.NORM_PRIORITY - 1); actorThread.setPriority(Thread.NORM_PRIORITY - 1);
} }
actorThread.setName("SHPD Actor Thread"); actorThread.setName("SHPD Actor Thread");
Thread.currentThread().setName("SHPD Render Thread"); Thread.currentThread().setName("SHPD Render Thread");
Actor.keepActorThreadAlive = true;
actorThread.start(); actorThread.start();
} else { } else {
synchronized (actorThread) { synchronized (actorThread) {