LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.9.4: fixed crashes if hero ankhs without a holster in inventory

Browse Source
This commit is contained in:
Evan Debenham 2021-08-12 13:09:20 -04:00
parent fa667db0e7
commit 76bd7b8d15
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -2006,7 +2006,7 @@ public class Hero extends Char {
} else if (i instanceof CloakOfShadows && i.keptThoughLostInvent && hasTalent(Talent.LIGHT_CLOAK)){ } else if (i instanceof CloakOfShadows && i.keptThoughLostInvent && hasTalent(Talent.LIGHT_CLOAK)){
((CloakOfShadows) i).activate(this); ((CloakOfShadows) i).activate(this);
} else if (i instanceof Wand && i.keptThoughLostInvent){ } else if (i instanceof Wand && i.keptThoughLostInvent){
if (holster.contains(i)){ if (holster != null && holster.contains(i)){
((Wand) i).charge(this, MagicalHolster.HOLSTER_SCALE_FACTOR); ((Wand) i).charge(this, MagicalHolster.HOLSTER_SCALE_FACTOR);
} else { } else {
((Wand) i).charge(this); ((Wand) i).charge(this);

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

@ -38,7 +38,7 @@ public class LostBackpack extends Item {
} else if ( i instanceof CloakOfShadows && hero.hasTalent(Talent.LIGHT_CLOAK)){ } else if ( i instanceof CloakOfShadows && hero.hasTalent(Talent.LIGHT_CLOAK)){
((CloakOfShadows) i).activate(hero); ((CloakOfShadows) i).activate(hero);
} else if (i instanceof Wand){ } else if (i instanceof Wand){
if (holster.contains(i)){ if (holster != null && holster.contains(i)){
((Wand) i).charge(hero, MagicalHolster.HOLSTER_SCALE_FACTOR); ((Wand) i).charge(hero, MagicalHolster.HOLSTER_SCALE_FACTOR);
} else { } else {
((Wand) i).charge(hero); ((Wand) i).charge(hero);