From 1e0ee1eca9575d9652c520f97dc5d8f1c52f7eb8 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Wed, 28 Dec 2022 13:47:02 -0500
Subject: [PATCH] v2.0.0: magical fire now cancels out regular fire

---
 .../levels/rooms/special/MagicalFireRoom.java                 | 4 ++++
 1 file changed, 4 insertions(+)

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 3af355a4c..d31178e20 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
@@ -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;