From f3be3584db3e0398334a62f75b18c6b0f4be9db7 Mon Sep 17 00:00:00 2001
From: devbeni <ballobeni08@gmail.com>
Date: Sat, 13 Dec 2025 14:29:21 +0100
Subject: [PATCH] some fix

---
 ServerLobby/PlayerEntryScript.cs | 43 ++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/ServerLobby/PlayerEntryScript.cs b/ServerLobby/PlayerEntryScript.cs
index a564621..6364fdd 100644
--- a/ServerLobby/PlayerEntryScript.cs
+++ b/ServerLobby/PlayerEntryScript.cs
@@ -21,15 +21,15 @@ namespace KCM.ServerLobby
 
         public void Start()
         {
+            banner = transform.Find("PlayerBanner").GetComponent<RawImage>();
+
             SetValues();
 
             InvokeRepeating("SetValues", 0, 0.25f);
 
-            banner = transform.Find("PlayerBanner").GetComponent<RawImage>();
-
             transform.Find("PlayerBanner").GetComponent<Button>().onClick.AddListener(() =>
             {
-                Main.TransitionTo(MenuState.NameAndBanner);//ChooseBannerUI Hooks required, as well as townnameui
+                Main.TransitionTo(MenuState.NameAndBanner);
             });
         }
 
@@ -37,14 +37,37 @@ namespace KCM.ServerLobby
         {
             try
             {
-                KCPlayer player;
-                Main.kCPlayers.TryGetValue(Main.GetPlayerByClientID(Client).steamId, out player);
-                transform.Find("PlayerName").GetComponent<TextMeshProUGUI>().text = player.name;
-                transform.Find("Ready").gameObject.SetActive(player.ready);
+                if (banner == null)
+                {
+                    var bannerTransform = transform.Find("PlayerBanner");
+                    if (bannerTransform == null)
+                        return;
+                    banner = bannerTransform.GetComponent<RawImage>();
+                    if (banner == null)
+                        return;
+                }
 
-                var bannerTexture = World.inst.liverySets[player.banner].banners;
-                
-                banner.texture = bannerTexture;
+                if (!Main.clientSteamIds.TryGetValue(Client, out var steamId))
+                    return;
+
+                if (!Main.kCPlayers.TryGetValue(steamId, out var player) || player == null)
+                    return;
+
+                var nameTransform = transform.Find("PlayerName");
+                if (nameTransform != null)
+                    nameTransform.GetComponent<TextMeshProUGUI>().text = player.name ?? "";
+
+                var readyTransform = transform.Find("Ready");
+                if (readyTransform != null)
+                    readyTransform.gameObject.SetActive(player.ready);
+
+                if (World.inst == null || World.inst.liverySets == null)
+                    return;
+
+                if (player.banner < 0 || player.banner >= World.inst.liverySets.Length)
+                    return;
+
+                banner.texture = World.inst.liverySets[player.banner].banners;
             }
             catch (Exception ex)
             {