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

v3.0.0: adjusted a few lines of code to include better safety checks

Browse Source
This commit is contained in:
Evan Debenham
2025-02-19 12:40:19 -05:00
parent 57d3b3039b
commit a73473836f
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
View File

@@ -370,11 +370,12 @@ public class Ring extends KindofMisc {
for (RingBuff buff : target.buffs(type)) {
bonus += buff.level();
}
SpiritForm.SpiritFormBuff spiritForm = target.buff(SpiritForm.SpiritFormBuff.class);
if (bonus == 0
&& target.buff(SpiritForm.SpiritFormBuff.class) != null
&& target.buff(SpiritForm.SpiritFormBuff.class).ring() != null
&& target.buff(SpiritForm.SpiritFormBuff.class).ring().buffClass == type){
bonus += target.buff(SpiritForm.SpiritFormBuff.class).ring().soloBonus();
&& spiritForm != null
&& spiritForm.ring() != null
&& spiritForm.ring().buffClass == type){
bonus += spiritForm.ring().soloBonus();
}
return bonus;
}

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/TargetHealthIndicator.java
View File

@@ -40,7 +40,8 @@ public class TargetHealthIndicator extends HealthBar {
public void update() {
super.update();
if (target != null && target.isAlive() && target.isActive() && target.sprite.visible) {
if (target != null && target.isAlive() && target.isActive()
&& target.sprite != null && target.sprite.visible) {
CharSprite sprite = target.sprite;
width = sprite.width();
x = sprite.x;