diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java index 9a3baa5a5..23b58a1f5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java @@ -390,7 +390,9 @@ public abstract class Elemental extends Mob { Music.INSTANCE.fadeOut(1f, new Callback() { @Override public void call() { - Dungeon.level.playLevelMusic(); + if (Dungeon.level != null) { + Dungeon.level.playLevelMusic(); + } } }); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java index cea061298..ffca7e849 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java @@ -194,7 +194,9 @@ public class Ghost extends NPC { Music.INSTANCE.fadeOut(1f, new Callback() { @Override public void call() { - Dungeon.level.playLevelMusic(); + if (Dungeon.level != null) { + Dungeon.level.playLevelMusic(); + } } }); } @@ -367,7 +369,9 @@ public class Ghost extends NPC { Music.INSTANCE.fadeOut(1f, new Callback() { @Override public void call() { - Dungeon.level.playLevelMusic(); + if (Dungeon.level != null) { + Dungeon.level.playLevelMusic(); + } } }); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java index b980d5977..0b5bc30ae 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java @@ -358,7 +358,8 @@ public class Wandmaker extends NPC { //quest is active if: public static boolean active(){ //it is not completed - if (wand1 == null || wand2 == null || !(Dungeon.level instanceof RegularLevel)){ + if (wand1 == null || wand2 == null + || !(Dungeon.level instanceof RegularLevel) || Dungeon.hero == null){ return false; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java index 9217d0ec9..1a446f19f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java @@ -150,11 +150,12 @@ public class CorpseDust extends Item { Game.runOnRenderThread(new Callback() { @Override public void call() { - //maybe have a fade here? Music.INSTANCE.fadeOut(1f, new Callback() { @Override public void call() { - Dungeon.level.playLevelMusic(); + if (Dungeon.level != null) { + Dungeon.level.playLevelMusic(); + } } }); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java index df43a958e..1ebe9fb05 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java @@ -157,7 +157,9 @@ public class PrisonLevel extends RegularLevel { Music.INSTANCE.fadeOut(1f, new Callback() { @Override public void call() { - Dungeon.level.playLevelMusic(); + if (Dungeon.level != null) { + Dungeon.level.playLevelMusic(); + } } }); }