From 9af5674f35e423a72cebc664807a31ccf5827602 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 17 Jun 2022 15:28:04 -0400 Subject: [PATCH] v1.3.0: fixed inter floor teleporting working on locked floors --- .../com/shatteredpixel/shatteredpixeldungeon/Dungeon.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java index 3edc215e5..123cf02e5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java @@ -386,7 +386,7 @@ public class Dungeon { } public static boolean interfloorTeleportAllowed(){ - if (Dungeon.hero != null && Dungeon.hero.belongings.getItem(Amulet.class) != null){ + if (Dungeon.level.locked || (Dungeon.hero != null && Dungeon.hero.belongings.getItem(Amulet.class) != null)){ return false; } return true; @@ -722,11 +722,11 @@ public class Dungeon { Dungeon.level = null; Actor.clear(); - + Bundle bundle = FileUtils.bundleFromFile( GamesInProgress.depthFile( save, depth, branch )); - + Level level = (Level)bundle.get( LEVEL ); - + if (level == null){ throw new IOException(); } else {