From 273959532043f3f99e5413627665ef0709bca5a0 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Sun, 1 Oct 2017 16:51:44 -0400
Subject: [PATCH] v0.6.2: bugfixes

---
 .../shatteredpixeldungeon/actors/blobs/Fire.java              | 4 ++--
 .../shatteredpixeldungeon/actors/blobs/Freezing.java          | 2 +-
 .../shatteredpixeldungeon/levels/traps/WarpingTrap.java       | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Fire.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Fire.java
index a2d207ddc..8705be816 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Fire.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Fire.java
@@ -51,7 +51,7 @@ public class Fire extends Blob {
 				cell = i + j*Dungeon.level.width();
 				if (cur[cell] > 0) {
 					
-					if (freeze != null && freeze.cur[cell] > 0){
+					if (freeze != null && freeze.volume > 0 && freeze.cur[cell] > 0){
 						freeze.clear(cell);
 						off[cell] = cur[cell] = 0;
 						continue;
@@ -69,7 +69,7 @@ public class Fire extends Blob {
 
 					}
 
-				} else if (freeze == null || freeze.cur[cell] < 0) {
+				} else if (freeze == null || freeze.volume <= 0 || freeze.cur[cell] < 0) {
 
 					if (flamable[cell]
 							&& (cur[cell-1] > 0
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Freezing.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Freezing.java
index 56dc365e1..853d297b3 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Freezing.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Freezing.java
@@ -49,7 +49,7 @@ public class Freezing extends Blob {
 				cell = i + j*Dungeon.level.width();
 				if (cur[cell] > 0) {
 					
-					if (fire != null && fire.cur[cell] > 0){
+					if (fire != null && fire.volume > 0 && fire.cur[cell] > 0){
 						fire.clear(cell);
 						off[cell] = cur[cell] = 0;
 						continue;
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WarpingTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WarpingTrap.java
index 368016926..775e4bcbb 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WarpingTrap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WarpingTrap.java
@@ -33,6 +33,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
+import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.utils.BArray;
 import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
 import com.watabou.noosa.audio.Sample;
@@ -54,6 +55,7 @@ public class WarpingTrap extends Trap {
 			ScrollOfTeleportation.teleportHero( (Hero)ch);
 			BArray.setFalse(Dungeon.level.visited);
 			BArray.setFalse(Dungeon.level.mapped);
+			GameScene.updateFog();
 			Dungeon.observe();
 			
 		} else if (ch != null){