diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfWealth.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfWealth.java index c5cc74e32..ebee2b310 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfWealth.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfWealth.java @@ -154,7 +154,7 @@ public class RingOfWealth extends Ring { private static int latestDropTier = 0; public static void showFlareForBonusDrop( Visual vis ){ - if (vis == null) return; + if (vis == null || vis.parent == null) return; switch (latestDropTier){ default: break; //do nothing 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 2993e6ff3..728117db1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -173,7 +173,7 @@ public class GameScene extends PixelScene { @Override public void create() { - if (Dungeon.hero == null){ + if (Dungeon.hero == null || Dungeon.level == null){ ShatteredPixelDungeon.switchNoFade(TitleScene.class); return; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java index 80efd93b1..c473d6a57 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/PixelScene.java @@ -214,7 +214,8 @@ public class PixelScene extends Scene { banner.camera = uiCamera; banner.x = align( banner.camera, (banner.camera.width - banner.width) / 2 ); banner.y = align( banner.camera, (banner.camera.height - banner.height) / 3 ); - Game.scene().add( banner ); + Scene s = Game.scene(); + if (s != null) s.add( banner ); } protected static class Fader extends ColorBlock {