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

v1.4.2: added a few safety checks

Browse Source
This commit is contained in:
Evan Debenham
2022-10-17 12:32:59 -04:00
parent 49b73a7575
commit 9599d7a420
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java
+3 -3
View File
@@ -83,13 +83,13 @@ public class SpellSprite extends Image {
@Override @Override
public void update() { public void update() {
super.update(); super.update();
if (target.sprite != null) { if (target != null && target.sprite != null) {
x = target.sprite.center().x - SIZE / 2; x = target.sprite.center().x - SIZE / 2;
y = target.sprite.y - SIZE; y = target.sprite.y - SIZE;
} }
if (phase == null){ if (phase == null || target == null){
return; return;
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/DangerIndicator.java
+3 -1
View File
@@ -116,7 +116,9 @@ public class DangerIndicator extends Tag {
QuickSlotButton.target(target); QuickSlotButton.target(target);
if (Dungeon.hero.canAttack(target)) AttackIndicator.target(target); if (Dungeon.hero.canAttack(target)) AttackIndicator.target(target);
if (Dungeon.hero.curAction == null) Camera.main.panTo(target.sprite.center(), 5f); if (Dungeon.hero.curAction == null && target.sprite != null) {
Camera.main.panTo(target.sprite.center(), 5f);
}
} }
} }