From c4e8fef8d06d44ab6d790a2ad565a2e3d3782499 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 10 Aug 2020 14:28:43 -0400
Subject: [PATCH] Fixed #2335 (probably)

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

diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java
index a863521830..ca323206bd 100644
--- a/core/src/mindustry/entities/comp/UnitComp.java
+++ b/core/src/mindustry/entities/comp/UnitComp.java
@@ -282,6 +282,11 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
             controller.updateUnit();
         }
 
+        //clear controller when it becomes invalid
+        if(!controller.isValidController()){
+            resetController();
+        }
+
         //do not control anything when deactivated
         if(deactivated){
             controlWeapons(false, false);