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

v3.0.0: added hero ref safety checks to isEquipped

Browse Source
This commit is contained in:
Evan Debenham
2024-10-20 12:08:01 -04:00
parent d1ae02b51a
commit c7f0be52f2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/KindOfWeapon.java
View File

@@ -92,7 +92,7 @@ abstract public class KindOfWeapon extends EquipableItem {
@Override @Override
public boolean isEquipped( Hero hero ) { public boolean isEquipped( Hero hero ) {
return hero.belongings.weapon() == this || hero.belongings.secondWep() == this; return hero != null && (hero.belongings.weapon() == this || hero.belongings.secondWep() == this);
} }
private static boolean isSwiftEquipping = false; private static boolean isSwiftEquipping = false;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java
View File

@@ -304,7 +304,7 @@ public class Armor extends EquipableItem {
@Override @Override
public boolean isEquipped( Hero hero ) { public boolean isEquipped( Hero hero ) {
return hero.belongings.armor() == this; return hero != null && hero.belongings.armor() == this;
} }
public final int DRMax(){ public final int DRMax(){