From 487b630d625439ce2bcc1b3d49ac6b26f6c41da6 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 28 Jun 2022 16:09:21 -0400
Subject: [PATCH] Fixed #7087

---
 core/src/mindustry/entities/Fires.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/entities/Fires.java b/core/src/mindustry/entities/Fires.java
index 7c84258bf8..b22e39eb4f 100644
--- a/core/src/mindustry/entities/Fires.java
+++ b/core/src/mindustry/entities/Fires.java
@@ -62,10 +62,14 @@ public class Fires{
     }
 
     public static void remove(Tile tile){
-        map.remove(tile.pos());
+        if(tile != null){
+            map.remove(tile.pos());
+        }
     }
 
     public static void register(Fire fire){
-        map.put(fire.tile.pos(), fire);
+        if(fire.tile != null){
+            map.put(fire.tile.pos(), fire);
+        }
     }
 }