From c6cc0d78e11049f70cc36c483fdca6cc0d2d4a89 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 30 Aug 2022 13:25:46 -0400 Subject: [PATCH] v1.4.0: added an additional safety check to knockback logic --- .../shatteredpixeldungeon/items/wands/WandOfBlastWave.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlastWave.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlastWave.java index d278c5149..49dadbe8a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlastWave.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlastWave.java @@ -150,8 +150,8 @@ public class WandOfBlastWave extends DamageWand { Actor.addDelayed(new Pushing(ch, ch.pos, newPos, new Callback() { public void call() { - if (initialpos != ch.pos) { - //something caused movement before pushing resolved, cancel to be safe. + if (initialpos != ch.pos || Actor.findChar(newPos) != null) { + //something caused movement or added chars before pushing resolved, cancel to be safe. ch.sprite.place(ch.pos); return; }