Merge remote-tracking branch 'origin/master'

2022-06-18 16:07:08 -04:00
parent 031af7c432 b59e519e0d
commit 077ee978f6
38 changed files with 492 additions and 393 deletions
--- a/core/src/mindustry/entities/comp/UnitComp.java
+++ b/core/src/mindustry/entities/comp/UnitComp.java
@@ -51,6 +51,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
    //TODO could be better represented as a unit
    transient @Nullable UnitType dockedType;

+    transient String lastCommanded;
    transient float shadowAlpha = -1f, healTime;
    transient int lastFogPos;
    private transient float resupplyTime = Mathf.random(10f);