LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v1.1.0: fixed rare cases where resurrecting onto grass would crash the game

Browse Source
This commit is contained in:
Evan Debenham 2021-11-08 15:44:29 -05:00
parent 30eb015a57
commit 5670306131
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java
View File

@ -32,6 +32,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.items.LostBackpack; import com.shatteredpixel.shatteredpixeldungeon.items.LostBackpack;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
import com.shatteredpixel.shatteredpixeldungeon.levels.features.Chasm; import com.shatteredpixel.shatteredpixeldungeon.levels.features.Chasm;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.special.SpecialRoom; import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.special.SpecialRoom;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
@ -462,9 +463,16 @@ public class InterlevelScene extends PixelScene {
do { do {
Dungeon.hero.pos = level.randomRespawnCell(Dungeon.hero); Dungeon.hero.pos = level.randomRespawnCell(Dungeon.hero);
tries++; tries++;
//prevents spawning on traps or plants, prefers farther locations first
} while (level.traps.get(Dungeon.hero.pos) != null } while (level.traps.get(Dungeon.hero.pos) != null
|| (level.plants.get(Dungeon.hero.pos) != null && tries < 500) || (level.plants.get(Dungeon.hero.pos) != null && tries < 500)
|| level.trueDistance(invPos, Dungeon.hero.pos) <= 30 - (tries/10)); || level.trueDistance(invPos, Dungeon.hero.pos) <= 30 - (tries/10));
//directly trample grass
if (level.map[Dungeon.hero.pos] == Terrain.HIGH_GRASS || level.map[Dungeon.hero.pos] == Terrain.FURROWED_GRASS){
level.map[Dungeon.hero.pos] = Terrain.GRASS;
}
Dungeon.hero.resurrect(); Dungeon.hero.resurrect();
level.drop(new LostBackpack(), invPos); level.drop(new LostBackpack(), invPos);
} }