From db74efea10a8c76bed4a12174b38a5188dee5d4d Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 4 Jan 2022 18:37:03 -0500 Subject: [PATCH] v1.1.2: removed waiting on pause and improved bundle saving efficiency This will hopefully address save corruption errors for Pixel phones on Android 12 --- SPD-classes/src/main/java/com/watabou/utils/Bundle.java | 3 ++- .../shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SPD-classes/src/main/java/com/watabou/utils/Bundle.java b/SPD-classes/src/main/java/com/watabou/utils/Bundle.java index 1b9de5089..93f23e61a 100644 --- a/SPD-classes/src/main/java/com/watabou/utils/Bundle.java +++ b/SPD-classes/src/main/java/com/watabou/utils/Bundle.java @@ -23,6 +23,7 @@ package com.watabou.utils; import com.badlogic.gdx.utils.JsonReader; import com.badlogic.gdx.utils.JsonValue; +import com.badlogic.gdx.utils.JsonWriter; import com.watabou.noosa.Game; import java.io.BufferedInputStream; @@ -452,7 +453,7 @@ public class Bundle { if (compressed) writer = new BufferedWriter( new OutputStreamWriter( new GZIPOutputStream(stream, GZIP_BUFFER ) ) ); else writer = new BufferedWriter( new OutputStreamWriter( stream ) ); - writer.write( bundle.toString() ); + bundle.data.prettyPrint(JsonWriter.OutputType.json, writer); writer.close(); return true; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java index 2fb57d190..fc8061ab4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -627,7 +627,6 @@ public class GameScene extends PixelScene { @Override public synchronized void onPause() { try { - if (Dungeon.hero != null && !Dungeon.hero.ready) waitForActorThread(500, false); Dungeon.saveAll(); Badges.saveGlobal(); Journal.saveGlobal();