From ca23637437f04665a51b13ac62b8095d406916fc Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Wed, 20 Jun 2018 19:18:56 -0400
Subject: [PATCH] v0.7.0: bugfixes:
- runestones appearing in bookshelves rarely
- crashes with new teleportation effect
---
.../items/scrolls/ScrollOfTeleportation.java | 1 +
.../levels/rooms/secret/SecretRunestoneRoom.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
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 143c87d7f..69c5535f4 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
@@ -134,6 +134,7 @@ public class ScrollOfTeleportation extends Scroll {
if (!(Dungeon.level instanceof RegularLevel)){
teleportHero( hero );
+ return;
}
RegularLevel level = (RegularLevel) Dungeon.level;
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretRunestoneRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretRunestoneRoom.java
index 715fe9e57..35bdb8c10 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretRunestoneRoom.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretRunestoneRoom.java
@@ -72,7 +72,7 @@ public class SecretRunestoneRoom extends SecretRoom {
do{
dropPos = level.pointToCell(random());
- } while (level.map[dropPos] != Terrain.EMPTY && level.heaps.get(dropPos) != null);
+ } while (level.map[dropPos] != Terrain.EMPTY || level.heaps.get(dropPos) != null);
level.drop( Generator.random(Generator.Category.STONE), dropPos);
do{