Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

null controller for dead units

Browse Source
This commit is contained in:
Anuken
2021-02-25 10:54:05 -05:00
parent f6eba3edae
commit f5ac3ff7b0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/comp/UnitComp.java
View File

@@ -153,7 +153,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
case type -> type; case type -> type;
case name -> controller instanceof Player p ? p.name : null; case name -> controller instanceof Player p ? p.name : null;
case firstItem -> stack().amount == 0 ? null : item(); 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 ? case payloadType -> self() instanceof Payloadc pay ?
(pay.payloads().isEmpty() ? null : (pay.payloads().isEmpty() ? null :
pay.payloads().peek() instanceof UnitPayload p1 ? p1.unit.type : pay.payloads().peek() instanceof UnitPayload p1 ? p1.unit.type :