From 46165bd10c557cbfc11fc8863d1af65c6e9c41c6 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 25 Sep 2020 02:35:29 -0400 Subject: [PATCH] v0.9.0: various crash fixes relating to on-ID talents --- .../shatteredpixeldungeon/scenes/GameScene.java | 2 +- .../shatteredpixeldungeon/sprites/CharSprite.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 f0487e87d..e418481e3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -824,7 +824,7 @@ public class GameScene extends PixelScene { } public static void effect( Visual effect ) { - scene.effects.add( effect ); + if (scene != null) scene.effects.add( effect ); } public static void effectOverFog( Visual effect ) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java index 0ee560832..92f59aecb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java @@ -302,19 +302,19 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip public Emitter emitter() { Emitter emitter = GameScene.emitter(); - emitter.pos( this ); + if (emitter != null) emitter.pos( this ); return emitter; } public Emitter centerEmitter() { Emitter emitter = GameScene.emitter(); - emitter.pos( center() ); + if (emitter != null) emitter.pos( center() ); return emitter; } public Emitter bottomEmitter() { Emitter emitter = GameScene.emitter(); - emitter.pos( x, y + height, width, 0 ); + if (emitter != null) emitter.pos( x, y + height, width, 0 ); return emitter; }