Merge remote-tracking branch 'origin/master'

2021-08-08 13:38:01 -04:00
parent 00a2c1aad0 e40ab50e10
commit cc0d7af610
2 changed files with 12 additions and 12 deletions
--- a/core/src/mindustry/entities/comp/BuildingComp.java
+++ b/core/src/mindustry/entities/comp/BuildingComp.java
@@ -1074,7 +1074,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,

    public String getDisplayName(){
        //derelict team icon currently doesn't display
-        return team == Team.derelict ?  
+        return team == Team.derelict ?
            block.localizedName + "\n" + Core.bundle.get("block.derelict") :
            block.localizedName + (team == player.team() || team.emoji.isEmpty() ? "" : " " + team.emoji);
    }