From a6e349ab7ebcf135f16762ee28212ee3a94d1ff3 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Mon, 30 Aug 2021 18:59:45 -0400
Subject: [PATCH] v1.0.3: fixed extremely rare cases of the hero resurrecting
 onto plants

---
 .../shatteredpixeldungeon/scenes/InterlevelScene.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java
index 11701bf3f..42ff65511 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java
@@ -453,7 +453,6 @@ public class InterlevelScene extends PixelScene {
 			Dungeon.hero.pos = level.randomRespawnCell(Dungeon.hero);
 			level.drop(new LostBackpack(), level.randomRespawnCell(null));
 		} else {
-			Dungeon.hero.resurrect();
 			level = Dungeon.level;
 			BArray.setFalse(level.heroFOV);
 			BArray.setFalse(level.visited);
@@ -464,6 +463,8 @@ public class InterlevelScene extends PixelScene {
 				Dungeon.hero.pos = level.randomRespawnCell(Dungeon.hero);
 				tries++;
 			} while (level.trueDistance(invPos, Dungeon.hero.pos) <= 30 - (tries/10));
+			level.plants.remove(Dungeon.hero.pos); //so the hero does not spawn on a plant
+			Dungeon.hero.resurrect();
 			level.drop(new LostBackpack(), invPos);
 		}