From 87786441fff46ecd371e424173aff6855c448c61 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 7 Jan 2023 14:47:10 -0500
Subject: [PATCH] Fixed #8117

---
 core/src/mindustry/entities/comp/PuddleComp.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/mindustry/entities/comp/PuddleComp.java b/core/src/mindustry/entities/comp/PuddleComp.java
index f4ab8f12bf..a56dfb4ea4 100644
--- a/core/src/mindustry/entities/comp/PuddleComp.java
+++ b/core/src/mindustry/entities/comp/PuddleComp.java
@@ -50,6 +50,11 @@ abstract class PuddleComp implements Posc, Puddlec, Drawc, Syncc{
 
     @Override
     public void update(){
+        if(liquid == null || tile == null){
+            remove();
+            return;
+        }
+
         float addSpeed = accepting > 0 ? 3f : 0f;
 
         amount -= Time.delta * (1f - liquid.viscosity) / (5f + addSpeed);