diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java index 84f580dbd..6b43bbdd4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java @@ -122,7 +122,11 @@ public class WandOfCorruption extends Wand { protected void onZap(Ballistica bolt) { Char ch = Actor.findChar(bolt.collisionPos); - if (ch != null && ch instanceof Mob && !(ch instanceof NPC)){ + if (ch != null){ + + if (!(ch instanceof Mob) || ch instanceof NPC){ + return; + } Mob enemy = (Mob) ch; @@ -173,6 +177,9 @@ public class WandOfCorruption extends Wand { } processSoulMark(ch, chargesPerCast()); + + } else { + Dungeon.level.press(bolt.collisionPos, null); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java index 249035d00..984c85cef 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java @@ -86,6 +86,8 @@ public class WandOfFrost extends DamageWand { else Buff.prolong(ch, Chill.class, 2+level()); } + } else { + Dungeon.level.press(bolt.collisionPos, null); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java index 731a88f18..5ad1b83eb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfMagicMissile.java @@ -21,6 +21,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.wands; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; @@ -55,6 +56,8 @@ public class WandOfMagicMissile extends DamageWand { ch.sprite.burst(0xFFFFFFFF, level() / 2 + 2); + } else { + Dungeon.level.press(bolt.collisionPos, null); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java index edde9af9f..ab63ecb55 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java @@ -22,6 +22,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.wands; import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; @@ -57,6 +58,10 @@ public class WandOfVenom extends Wand { processSoulMark(ch, chargesPerCast()); } } + + if (Actor.findChar(bolt.collisionPos) == null){ + Dungeon.level.press(bolt.collisionPos, null); + } } @Override