v0.9.2: fixed bugs with previously changed gamescene functionality

This commit is contained in:
Evan Debenham 2021-02-07 13:54:40 -05:00
parent d40aee8d4d
commit 3fe42591d9

View File

@ -554,20 +554,22 @@ public class GameScene extends PixelScene {
} }
} }
public synchronized boolean waitForActorThread(int msToWait ){ public boolean waitForActorThread(int msToWait ){
if (actorThread != null && actorThread.isAlive()){ synchronized (GameScene.class) {
return true; if (actorThread == null || !actorThread.isAlive()) {
} return true;
synchronized (actorThread) { }
actorThread.interrupt(); synchronized (actorThread) {
} actorThread.interrupt();
try { }
GameScene.class.wait(msToWait); try {
} catch (InterruptedException e) { GameScene.class.wait(msToWait);
ShatteredPixelDungeon.reportException(e); } catch (InterruptedException e) {
} ShatteredPixelDungeon.reportException(e);
synchronized (actorThread) { }
return Actor.processing(); synchronized (actorThread) {
return !Actor.processing();
}
} }
} }