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

2021-09-15 20:51:57 -04:00
parent ba0892fdcb c4fe53955b
commit e86171e3c7
15 changed files with 77 additions and 56 deletions
--- a/core/src/mindustry/entities/comp/PlayerComp.java
+++ b/core/src/mindustry/entities/comp/PlayerComp.java
@@ -68,7 +68,7 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra

    public TextureRegion icon(){
        //display default icon for dead players
-        if(dead()) return core() == null ? UnitTypes.alpha.fullIcon : ((CoreBlock)core().block).unitType.fullIcon;
+        if(dead()) return core() == null ? UnitTypes.alpha.fullIcon : ((CoreBlock)bestCore().block).unitType.fullIcon;

        return unit.icon();
    }