konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.2.0: added some null safety checks to quest music playback

Browse Source
This commit is contained in:
Evan Debenham
2023-09-21 12:20:12 -04:00
parent a4db73be1a
commit 02bcd23378
5 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java
View File

@@ -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();
}
}
});
}

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java
View File

@@ -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();
}
}
});
}

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
View File

@@ -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;
}

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/CorpseDust.java
View File

@@ -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();
}
}
});
}

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java
View File

@@ -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();
}
}
});
}