From 347e95ed6b490a9be2b6f567f55d802b3c49f99d Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 17 Aug 2017 14:10:25 -0400 Subject: [PATCH] v0.6.1a: Lloyd's beacon is no longer blocked by none-hostile creatures --- .../shatteredpixeldungeon/items/artifacts/LloydsBeacon.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java index 5d398ea16..9643f8ee4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/LloydsBeacon.java @@ -29,6 +29,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LockedFloor; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; +import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation; @@ -116,7 +117,8 @@ public class LloydsBeacon extends Artifact { } for (int i = 0; i < PathFinder.NEIGHBOURS8.length; i++) { - if (Actor.findChar( hero.pos + PathFinder.NEIGHBOURS8[i] ) != null) { + Char ch = Actor.findChar(hero.pos + PathFinder.NEIGHBOURS8[i]); + if (ch != null && !(ch instanceof Mob && !((Mob) ch).hostile)) { GLog.w( Messages.get(this, "creatures") ); return; }