Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2022-06-18 16:07:08 -04:00
38 changed files with 492 additions and 393 deletions

View File

@@ -1250,7 +1250,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
if(value instanceof UnitType) type = UnitType.class;
if(builder != null && builder.isPlayer()){
lastAccessed = builder.getPlayer().name;
lastAccessed = builder.getPlayer().coloredName();
}
if(block.configurations.containsKey(type)){

View File

@@ -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);