diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java index e03ec993c..67e14f4ea 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java @@ -277,7 +277,7 @@ public abstract class Wand extends Item { } protected void wandUsed() { - if (!levelKnown && availableUsesToID >= 1) { + if (!isIdentified() && availableUsesToID >= 1) { availableUsesToID--; usesLeftToID--; if (usesLeftToID <= 0) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java index d87a8f1d1..9b2de9709 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java @@ -128,7 +128,7 @@ abstract public class MissileWeapon extends Weapon { return super.upgrade(); } } - + @Override public ArrayList actions( Hero hero ) { ArrayList actions = super.actions( hero ); @@ -152,6 +152,12 @@ abstract public class MissileWeapon extends Weapon { } } + @Override + public void doThrow(Hero hero) { + parent = null; //reset parent before throwing, just incase + super.doThrow(hero); + } + @Override protected void onThrow( int cell ) { Char enemy = Actor.findChar( cell );