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

v3.3.5: added a safety check to new save windows logic

Browse Source
This commit is contained in:
Evan Debenham
2026-01-26 14:25:47 -05:00
parent 679c2c210b
commit 6d640324c1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1593,7 +1593,7 @@ public class GameScene extends PixelScene {
@Override @Override
public synchronized void saveWindows() { public synchronized void saveWindows() {
super.saveWindows(); super.saveWindows();
if (scene.inventory != null && scene.inventory.getSelector() != null){ if (scene != null && scene.inventory != null && scene.inventory.getSelector() != null){
savedSelector = scene.inventory.getSelector(); savedSelector = scene.inventory.getSelector();
} else { } else {
for (Gizmo g : members.toArray(new Gizmo[0])){ for (Gizmo g : members.toArray(new Gizmo[0])){
@@ -1613,7 +1613,7 @@ public class GameScene extends PixelScene {
public synchronized void restoreWindows() { public synchronized void restoreWindows() {
super.restoreWindows(); super.restoreWindows();
if (savedSelector != null){ if (savedSelector != null){
if (scene.inventory != null){ if (scene != null && scene.inventory != null){
scene.inventory.setSelector(savedSelector); scene.inventory.setSelector(savedSelector);
} else { } else {
addToFront(new WndBag(Dungeon.hero.belongings.backpack, savedSelector)); addToFront(new WndBag(Dungeon.hero.belongings.backpack, savedSelector));