diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java index 6619c5343..6a6182305 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java @@ -96,6 +96,11 @@ public class ScrollOfTeleportation extends Scroll { if (!(Dungeon.level instanceof RegularLevel)){ return teleportInNonRegularLevel( ch, false ); } + + if (Char.hasProp(ch, Char.Property.IMMOVABLE)){ + GLog.w( Messages.get(ScrollOfTeleportation.class, "no_tele") ); + return false; + } int count = 20; int pos; @@ -204,6 +209,11 @@ public class ScrollOfTeleportation extends Scroll { //prefers not seen(optional) > not visible > visible public static boolean teleportInNonRegularLevel(Char ch, boolean preferNotSeen ){ + if (Char.hasProp(ch, Char.Property.IMMOVABLE)){ + GLog.w( Messages.get(ScrollOfTeleportation.class, "no_tele") ); + return false; + } + ArrayList visibleValid = new ArrayList<>(); ArrayList notVisibleValid = new ArrayList<>(); ArrayList notSeenValid = new ArrayList<>();