From 33a47b3172040784e26c85e35c13c98e40345780 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 18 May 2023 16:51:06 -0400 Subject: [PATCH] v2.1.0: fixed errors with new magic fire logic and adjusted it slightly --- .../levels/rooms/special/MagicalFireRoom.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MagicalFireRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MagicalFireRoom.java index 95377723c..e1ff838d4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MagicalFireRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MagicalFireRoom.java @@ -208,12 +208,6 @@ public class MagicalFireRoom extends SpecialRoom { || cur[cell-Dungeon.level.width()] > 0 || cur[cell+Dungeon.level.width()] > 0) { - //ignore cells which are behind the magical fire or water - if (Dungeon.level.map[cell] == Terrain.EMPTY_SP - || Dungeon.level.map[cell] == Terrain.WATER){ - continue; - } - //spread fire to nearby flammable cells if (Dungeon.level.flamable[cell] && (fire == null || fire.volume == 0 || fire.cur[cell] == 0)){ GameScene.add(Blob.seed(cell, 4, Fire.class)); @@ -226,7 +220,8 @@ public class MagicalFireRoom extends SpecialRoom { } //burn adjacent heaps, but only on outside cells - if (Dungeon.level.heaps.get(cell) != null){ + if (Dungeon.level.heaps.get(cell) != null + && Dungeon.level.map[cell] != Terrain.EMPTY_SP){ Dungeon.level.heaps.get(cell).burn(); } }