Merge remote-tracking branch 'origin/master'

core/src/mindustry/graphics/IndexedRenderer.java

@@ -11,7 +11,7 @@ import arc.util.*;
 public class IndexedRenderer implements Disposable{
     private static final int vsize = 5;
 
-    private Shader program = new Shader(
+    private final Shader program = new Shader(
     "attribute vec4 a_position;\n" +
     "attribute vec4 a_color;\n" +
     "attribute vec2 a_texCoord0;\n" +

core/src/mindustry/logic/RadarTarget.java

@@ -9,6 +9,7 @@ public enum RadarTarget{
     ally((team, other) -> team == other.team),
     player((team, other) -> other.isPlayer()),
     flying((team, other) -> other.isFlying()),
+    boss((team, other) -> other.isBoss()),
     ground((team, other) -> other.isGrounded());
 
     public final RadarTargetFunc func;

core/src/mindustry/world/blocks/units/CommandCenter.java

@@ -20,7 +20,7 @@ import mindustry.world.meta.*;
 
 public class CommandCenter extends Block{
     public TextureRegionDrawable[] commandRegions = new TextureRegionDrawable[UnitCommand.all.length];
-    public Color topColor = Pal.command, bottomColor = Color.valueOf("5e5e5e");
+    public Color topColor = null, bottomColor = Color.valueOf("5e5e5e");
     public Effect effect = Fx.commandSend;
 
     public CommandCenter(String name){
@@ -63,7 +63,7 @@ public class CommandCenter extends Block{
 
             Draw.color(bottomColor);
             Draw.rect(commandRegions[team.data().command.ordinal()].getRegion(), tile.drawx(), tile.drawy() - 1, size, size);
-            Draw.color(topColor);
+            Draw.color(topColor == null ? team.color : topColor);
             Draw.rect(commandRegions[team.data().command.ordinal()].getRegion(), tile.drawx(), tile.drawy(), size, size);
             Draw.color();
         }