From f5ac3ff7b00648f00f17a0ee12d1195a642604eb Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 25 Feb 2021 10:54:05 -0500 Subject: [PATCH] null controller for dead units --- core/src/mindustry/entities/comp/UnitComp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index f0c26cc0b4..bd251d4d3b 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -153,7 +153,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I case type -> type; case name -> controller instanceof Player p ? p.name : null; case firstItem -> stack().amount == 0 ? null : item(); - case controller -> controller instanceof LogicAI log ? log.controller : controller instanceof FormationAI form ? form.leader : this; + case controller -> !isValid() ? null : controller instanceof LogicAI log ? log.controller : controller instanceof FormationAI form ? form.leader : this; case payloadType -> self() instanceof Payloadc pay ? (pay.payloads().isEmpty() ? null : pay.payloads().peek() instanceof UnitPayload p1 ? p1.unit.type :