v2.0.0: magical fire now cancels out regular fire

2022-12-28 13:47:02 -05:00
parent 24883323f9
commit 1e0ee1eca9
1 changed files with 4 additions and 0 deletions
--- 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
@@ -185,6 +185,10 @@ public class MagicalFireRoom extends SpecialRoom {
 							cur[cell] = 0;
 							clearAll = true;
 						}
+						//overrides fire
+						if (fire != null && fire.volume > 0 && fire.cur[cell] > 0){
+							fire.clear(cell);
+						}
 						if (freeze != null && freeze.volume > 0 && freeze.cur[cell] > 0){
 							freeze.clear(cell);
 							cur[cell] = 0;