Merge remote-tracking branch 'origin/master'

2020-12-16 19:47:43 -05:00
parent 59c85a486f 8bc349b68c
commit cd7d2163b9
5 changed files with 48 additions and 29 deletions
--- a/core/src/mindustry/entities/comp/UnitComp.java
+++ b/core/src/mindustry/entities/comp/UnitComp.java
@@ -133,6 +133,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
            case mineY -> mining() ? mineTile.y : -1;
            case flag -> flag;
            case controlled -> controller instanceof LogicAI || controller instanceof Player ? 1 : 0;
+            case commanded -> controller instanceof FormationAI ? 1 : 0;
            case payloadCount -> self() instanceof Payloadc pay ? pay.payloads().size : 0;
            default -> 0;
        };