From d196fda2dd54cfc0f939c58f20be1949b4ec16d4 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 14 Dec 2014 01:21:59 -0500 Subject: [PATCH] v0.2.3: fixed an interaction bug between wand of telekinesis and shopkeepers --- .../shatteredpixeldungeon/items/wands/WandOfTelekinesis.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTelekinesis.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTelekinesis.java index bbc95f9e3..822ce957f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTelekinesis.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTelekinesis.java @@ -17,6 +17,7 @@ */ package com.shatteredpixel.shatteredpixeldungeon.items.wands; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Shopkeeper; import com.watabou.noosa.audio.Sample; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; @@ -80,6 +81,9 @@ public class WandOfTelekinesis extends Wand { ch.pos = next; Actor.freeCell( next ); + if (ch instanceof Shopkeeper) + ch.damage( 0, this ); + // FIXME if (ch instanceof Mob) { Dungeon.level.mobPress( (Mob)ch );