From ba78eab30ae57589db6615db5c28b3665ad5126b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 23 Jun 2020 15:40:24 -0400
Subject: [PATCH] Proper player icons

---
 core/src/mindustry/core/UI.java                         | 1 -
 core/src/mindustry/entities/comp/PlayerComp.java        | 8 ++++++++
 core/src/mindustry/ui/fragments/PlayerListFragment.java | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
index f26c2cd498..d9187e6674 100644
--- a/core/src/mindustry/core/UI.java
+++ b/core/src/mindustry/core/UI.java
@@ -64,7 +64,6 @@ public class UI implements ApplicationListener, Loadable{
     public ContentInfoDialog content;
     public PlanetDialog planet;
     public TechTreeDialog tech;
-    //public MinimapDialog minimap;
     public SchematicsDialog schematics;
     public ModsDialog mods;
     public ColorPicker picker;
diff --git a/core/src/mindustry/entities/comp/PlayerComp.java b/core/src/mindustry/entities/comp/PlayerComp.java
index 63d27a8e95..a79dc15f5f 100644
--- a/core/src/mindustry/entities/comp/PlayerComp.java
+++ b/core/src/mindustry/entities/comp/PlayerComp.java
@@ -9,6 +9,7 @@ import arc.util.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.pooling.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.entities.units.*;
 import mindustry.game.*;
@@ -20,6 +21,7 @@ import mindustry.net.*;
 import mindustry.net.Packets.*;
 import mindustry.ui.*;
 import mindustry.world.*;
+import mindustry.world.blocks.storage.*;
 import mindustry.world.blocks.storage.CoreBlock.*;
 
 import static mindustry.Vars.*;
@@ -58,6 +60,12 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         return team.core();
     }
 
+    public TextureRegion icon(){
+        if(dead()) return core() == null ? UnitTypes.alpha.icon(Cicon.full) : ((CoreBlock)core().block).unitType.icon(Cicon.full);
+
+        return unit.type().icon(Cicon.full);
+    }
+
     public void reset(){
         team = state.rules.defaultTeam;
         admin = typing = false;
diff --git a/core/src/mindustry/ui/fragments/PlayerListFragment.java b/core/src/mindustry/ui/fragments/PlayerListFragment.java
index ae320c87d0..8da707fb00 100644
--- a/core/src/mindustry/ui/fragments/PlayerListFragment.java
+++ b/core/src/mindustry/ui/fragments/PlayerListFragment.java
@@ -99,7 +99,7 @@ public class PlayerListFragment extends Fragment{
             };
             table.margin(8);
             //TODO dead players should have no region
-            table.add(new Image(user.unit().type().region).setScaling(Scaling.none)).grow();
+            table.add(new Image(user.icon()).setScaling(Scaling.none)).grow();
 
             button.add(table).size(h);
             button.labelWrap("[#" + user.color().toString().toUpperCase() + "]" + user.name()).width(170f).pad(10);