Crash fix, minor duct bridge cost reduction

2025-04-17 14:38:39 -04:00
parent defa3a5887
commit c4a54ec103
3 changed files with 14 additions and 3 deletions
--- a/core/src/mindustry/entities/comp/PlayerComp.java
+++ b/core/src/mindustry/entities/comp/PlayerComp.java
@@ -76,7 +76,16 @@ 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.uiIcon : ((CoreBlock)bestCore().block).unitType.uiIcon;
+        if(dead()){
+            if(core() == null){
+                return UnitTypes.alpha.uiIcon;
+            }
+            var bestCore = (CoreBuild)bestCore();
+            if(bestCore == null){
+                return UnitTypes.alpha.uiIcon;
+            }
+            return ((CoreBlock)bestCore.block).unitType.uiIcon;
+        }

        return unit.icon();
    }