v2.2.0: added some null safety checks to quest music playback
This commit is contained in:
+3
-1
@@ -390,7 +390,9 @@ public abstract class Elemental extends Mob {
|
|||||||
Music.INSTANCE.fadeOut(1f, new Callback() {
|
Music.INSTANCE.fadeOut(1f, new Callback() {
|
||||||
@Override
|
@Override
|
||||||
public void call() {
|
public void call() {
|
||||||
Dungeon.level.playLevelMusic();
|
if (Dungeon.level != null) {
|
||||||
|
Dungeon.level.playLevelMusic();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-2
@@ -194,7 +194,9 @@ public class Ghost extends NPC {
|
|||||||
Music.INSTANCE.fadeOut(1f, new Callback() {
|
Music.INSTANCE.fadeOut(1f, new Callback() {
|
||||||
@Override
|
@Override
|
||||||
public void call() {
|
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() {
|
Music.INSTANCE.fadeOut(1f, new Callback() {
|
||||||
@Override
|
@Override
|
||||||
public void call() {
|
public void call() {
|
||||||
Dungeon.level.playLevelMusic();
|
if (Dungeon.level != null) {
|
||||||
|
Dungeon.level.playLevelMusic();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -358,7 +358,8 @@ public class Wandmaker extends NPC {
|
|||||||
//quest is active if:
|
//quest is active if:
|
||||||
public static boolean active(){
|
public static boolean active(){
|
||||||
//it is not completed
|
//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;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
-2
@@ -150,11 +150,12 @@ public class CorpseDust extends Item {
|
|||||||
Game.runOnRenderThread(new Callback() {
|
Game.runOnRenderThread(new Callback() {
|
||||||
@Override
|
@Override
|
||||||
public void call() {
|
public void call() {
|
||||||
//maybe have a fade here?
|
|
||||||
Music.INSTANCE.fadeOut(1f, new Callback() {
|
Music.INSTANCE.fadeOut(1f, new Callback() {
|
||||||
@Override
|
@Override
|
||||||
public void call() {
|
public void call() {
|
||||||
Dungeon.level.playLevelMusic();
|
if (Dungeon.level != null) {
|
||||||
|
Dungeon.level.playLevelMusic();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -157,7 +157,9 @@ public class PrisonLevel extends RegularLevel {
|
|||||||
Music.INSTANCE.fadeOut(1f, new Callback() {
|
Music.INSTANCE.fadeOut(1f, new Callback() {
|
||||||
@Override
|
@Override
|
||||||
public void call() {
|
public void call() {
|
||||||
Dungeon.level.playLevelMusic();
|
if (Dungeon.level != null) {
|
||||||
|
Dungeon.level.playLevelMusic();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user