v0.9.1: fixed rare crashes caused by cursed wand effects

2020-12-05 19:46:13 -05:00
parent 1f5ad491fd
commit 19f1edd311
1 changed files with 1 additions and 0 deletions
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java
@@ -359,6 +359,7 @@ public abstract class Wand extends Item {

 		//if the wand is owned by the hero, but not in their inventory, it must be in the staff
 		if (curCharges == 0
+				&& charger != null
 				&& charger.target == Dungeon.hero
 				&& !Dungeon.hero.belongings.contains(this)
 				&& Dungeon.hero.hasTalent(Talent.BACKUP_BARRIER)){