Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

2021-10-15 14:24:48 -04:00
parent 56d291c963 816ab161df
commit 176343e862
10 changed files with 29 additions and 17 deletions
--- a/core/src/mindustry/entities/comp/UnitComp.java
+++ b/core/src/mindustry/entities/comp/UnitComp.java
@@ -11,6 +11,7 @@ import arc.util.*;
 import mindustry.ai.*;
 import mindustry.ai.types.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.ctype.*;
 import mindustry.entities.*;
@@ -41,7 +42,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
    @Import WeaponMount[] mounts;

    private UnitController controller;
-    UnitType type;
+    UnitType type = UnitTypes.alpha;
    boolean spawnedByCore;
    double flag;