fix: Update button container paths for consistency and improve fallback handling

fix: Enhance SaveTransferPacket handling for out-of-order delivery and reset transfer state

.claude/settings.local.json

@@ -0,0 +1,12 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(wc:*)",
+      "Bash(find:*)",
+      "Bash(ls:*)",
+      "Bash(git add:*)",
+      "Bash(git commit:*)",
+      "Bash(tail:*)"
+    ]
+  }
+}

.gitignore

@@ -1,5 +1,4 @@
 # Logs / local debug output
-output*.txt
 *.log
 
 # OS junk
@@ -21,3 +20,8 @@ Desktop.ini
 **/obj/
 **/*.mdb
 **/*.pdb
+
+/.claude
+/*.png
+/*.txt
+/*.jpg

AGENTS.md

@@ -1,47 +0,0 @@
-# Repository Guidelines
-
-## Project Structure & Module Organization
-
-- `Main.cs`: primary Harmony patches, gameplay hooks, and high-level multiplayer flow.
-- `Packets/`: network message types and handlers (client/server). Subfolders group by domain (e.g., `Lobby`, `Game`, `State`, `Handlers`).
-- `LoadSaveOverrides/`: multiplayer-aware save/load containers and BinaryFormatter binder.
-- `StateManagement/`: observer-based state syncing (e.g., building state updates).
-- `ServerBrowser/`, `ServerLobby/`, `UI/`: menu screens, lobby UI, and related scripts/prefabs glue.
-- `Riptide/`, `RiptideSteamTransport/`: networking and Steam transport integration.
-- `Enums/`, `Constants.cs`, `ErrorCodeMessages.cs`, `ReflectionHelper/`: shared types/utilities.
-
-## Build, Test, and Development Commands
-
-This mod is typically compiled/loaded by the game’s mod loader (there is no `.csproj` here).
-
-- Validate changes quickly: `rg -n "TODO|FIXME|throw|NotImplementedException" -S .`
-- Inspect recent log output: `Get-Content .\\output.txt -Tail 200`
-- Check history/context: `git log -n 20 --oneline`
-
-To run locally, copy/enable the mod in *Kingdoms and Castles* and **fully restart the game** after changes. Keep host/client mod versions identical.
-
-## Coding Style & Naming Conventions
-
-- Language: C# (Unity/Mono). Prefer conservative language features to avoid in-game compiler issues.
-- Indentation: 4 spaces; braces on new lines (match existing files).
-- Names: `PascalCase` for types/methods, `camelCase` for locals/fields. Packet properties are public and serialized—treat renames as breaking changes.
-- Logging: use `Main.helper.Log(...)` with short, searchable messages.
-
-## Testing Guidelines
-
-No automated test suite. Verify in-game with a minimal repro:
-
-- Host ↔ join, place buildings, save/load, leave/rejoin, and confirm sync.
-- When reporting bugs, include `output.txt` excerpts around the first exception and “Save Transfer” markers.
-
-## Commit & Pull Request Guidelines
-
-Git history uses short, informal summaries. For contributions:
-
-- Commits: one-line, descriptive, avoid profanity; include a scope when helpful (e.g., `save: fix load fallback`).
-- PRs: describe the issue, repro steps, expected vs actual, and attach relevant `output.txt` snippets. Note game version, mod version, and whether it’s Workshop or local mod folder.
-
-## Agent-Specific Notes
-
-- Avoid edits that depend on newer C# syntax not supported by the runtime compiler.
-- Prefer small, isolated fixes; multiplayer regressions are easy to introduce—add logs around save/load and connect/disconnect paths.

Attributes/NoServerRelayAttribute.cs

@@ -1,10 +0,0 @@
-using System;
-
-namespace KCM.Attributes
-{
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
-    public class NoServerRelayAttribute : Attribute
-    {
-    }
-}
-

Constants.cs

@@ -15,19 +15,20 @@ namespace KCM
     /// </summary>
     public static class Constants
     {
-        public static readonly MainMenuMode MainMenuMode = GameState.inst.mainMenuMode;
-        public static readonly PlayingMode PlayingMode = GameState.inst.playingMode;
-        public static readonly World World = GameState.inst.world;
+        // Use lazy initialization to avoid null reference when GameState isn't ready yet
+        public static MainMenuMode MainMenuMode => GameState.inst?.mainMenuMode;
+        public static PlayingMode PlayingMode => GameState.inst?.playingMode;
+        public static World World => GameState.inst?.world;
 
         #region "UI"
-        public static readonly Transform MainMenuUI_T = MainMenuMode.mainMenuUI.transform;
-        public static readonly GameObject MainMenuUI_O = MainMenuMode.mainMenuUI;
+        public static Transform MainMenuUI_T => MainMenuMode?.mainMenuUI?.transform;
+        public static GameObject MainMenuUI_O => MainMenuMode?.mainMenuUI;
 
        /* public static readonly Transform TopLevelUI_T = MainMenuUI_T.parent;
         public static readonly GameObject TopLevelUI_O = MainMenuUI_T.parent.gameObject;*/
 
-        public static readonly Transform ChooseModeUI_T = MainMenuMode.chooseModeUI.transform;
-        public static readonly GameObject ChooseModeUI_O = MainMenuMode.chooseModeUI;
+        public static Transform ChooseModeUI_T => MainMenuMode?.chooseModeUI?.transform;
+        public static GameObject ChooseModeUI_O => MainMenuMode?.chooseModeUI;
         #endregion
 
     }

Enums/Packets.cs

@@ -18,11 +18,8 @@ namespace KCM.Enums
         KingdomName = 32,
         StartGame = 33,
         WorldSeed = 34,
-
-
         Building = 50,
         BuildingOnPlacement = 51,
-
         World = 70,
         WorldPlace = 71,
         FellTree = 72,
@@ -45,8 +42,6 @@ namespace KCM.Enums
         SetupInitialWorkers = 89,
         VillagerTeleportTo = 90,
         PlaceKeepRandomly = 91,
-        ResyncRequest = 92,
-        ResourceSnapshot = 93,
-        BuildingSnapshot = 94
+        BuildingRemove = 92
     }
 }

KCClient.cs

@@ -36,11 +36,10 @@ namespace KCM
 
         private static void Client_Disconnected(object sender, DisconnectedEventArgs e)
         {
+            Main.CleanupMultiplayerSession();
             Main.helper.Log("Client disconnected event start");
             try
             {
-                Main.ResetMultiplayerState("Client disconnected");
-
                 if (e.Message != null)
                 {
                     Main.helper.Log(e.Message.ToString());
@@ -78,19 +77,7 @@ namespace KCM
 
         private static void Client_Connected(object sender, EventArgs e)
         {
-            try
-            {
-                if (client != null && client.Connection != null)
-                {
-                    client.Connection.CanQualityDisconnect = false;
-                    client.Connection.MaxSendAttempts = 50;
-                }
-            }
-            catch (Exception ex)
-            {
-                Main.helper.Log("Error configuring client connection");
-                Main.helper.Log(ex.ToString());
-            }
+
 
         }
 

KCServer.cs

@@ -21,9 +21,6 @@ namespace KCM
         public static Server server = new Server(Main.steamServer);
         public static bool started = false;
 
-        private static readonly Dictionary<ushort, Queue<SaveTransferPacket>> saveTransferQueues = new Dictionary<ushort, Queue<SaveTransferPacket>>();
-        private const int SaveTransferPacketsPerUpdatePerClient = 10;
-
         static KCServer()
         {
             //server.registerMessageHandler(typeof(KCServer).GetMethod("ClientJoined"));
@@ -53,7 +50,6 @@ namespace KCM
                 }
 
                 ev.Client.CanQualityDisconnect = false;
-                ev.Client.MaxSendAttempts = 50;
 
                 Main.helper.Log("Client ID is: " + ev.Client.Id);
 
@@ -62,42 +58,15 @@ namespace KCM
 
             server.ClientDisconnected += (obj, ev) =>
             {
-                try
+                new ChatSystemMessage()
                 {
-                    var playerName = $"Client {ev.Client.Id}";
-                    string steamId;
-                    if (Main.clientSteamIds.TryGetValue(ev.Client.Id, out steamId) && !string.IsNullOrEmpty(steamId))
-                    {
-                        KCPlayer player;
-                        if (Main.kCPlayers.TryGetValue(steamId, out player) && player != null && !string.IsNullOrEmpty(player.name))
-                            playerName = player.name;
+                    Message = $"{Main.GetPlayerByClientID(ev.Client.Id).name} has left the server.",
+                }.SendToAll();
 
-                        Main.kCPlayers.Remove(steamId);
-                    }
+                Main.kCPlayers.Remove(Main.GetPlayerByClientID(ev.Client.Id).steamId);
+                Destroy(LobbyHandler.playerEntries.Select(x => x.GetComponent<PlayerEntryScript>()).Where(x => x.Client == ev.Client.Id).FirstOrDefault().gameObject);
 
-                    Main.clientSteamIds.Remove(ev.Client.Id);
-
-                    new ChatSystemMessage()
-                    {
-                        Message = $"{playerName} has left the server.",
-                    }.SendToAll();
-
-                    var entry = LobbyHandler.playerEntries
-                        .Select(x => x != null ? x.GetComponent<PlayerEntryScript>() : null)
-                        .FirstOrDefault(x => x != null && x.Client == ev.Client.Id);
-
-                    if (entry != null)
-                        Destroy(entry.gameObject);
-
-                    saveTransferQueues.Remove(ev.Client.Id);
-
-                    Main.helper.Log($"Client disconnected. {ev.Reason}");
-                }
-                catch (Exception ex)
-                {
-                    Main.helper.Log("Error handling client disconnect");
-                    Main.helper.Log(ex.ToString());
-                }
+                Main.helper.Log($"Client disconnected. {ev.Reason}");
             };
 
             Main.helper.Log($"Listening on port 7777. Max {LobbyHandler.ServerSettings.MaxPlayers} clients.");
@@ -131,69 +100,6 @@ namespace KCM
         private void Update()
         {
             server.Update();
-            ProcessSaveTransfers();
-            KCM.StateManagement.Sync.SyncManager.ServerUpdate();
-        }
-
-        private static void ProcessSaveTransfers()
-        {
-            if (!KCServer.IsRunning)
-                return;
-
-            if (saveTransferQueues.Count == 0)
-                return;
-
-            var clients = saveTransferQueues.Keys.ToList();
-            foreach (var clientId in clients)
-            {
-                Queue<SaveTransferPacket> queue;
-                if (!saveTransferQueues.TryGetValue(clientId, out queue) || queue == null)
-                    continue;
-
-                int sentThisUpdate = 0;
-                while (sentThisUpdate < SaveTransferPacketsPerUpdatePerClient && queue.Count > 0)
-                {
-                    var packet = queue.Dequeue();
-                    packet.Send(clientId);
-                    sentThisUpdate++;
-                }
-
-                if (queue.Count == 0)
-                    saveTransferQueues.Remove(clientId);
-            }
-        }
-
-        public static void EnqueueSaveTransfer(ushort toClient, byte[] bytes)
-        {
-            if (bytes == null)
-                return;
-
-            int chunkSize = 900;
-            int sent = 0;
-            int totalChunks = (int)Math.Ceiling((double)bytes.Length / chunkSize);
-
-            var queue = new Queue<SaveTransferPacket>(totalChunks);
-            for (int i = 0; i < totalChunks; i++)
-            {
-                int currentChunkSize = Math.Min(chunkSize, bytes.Length - sent);
-                var chunk = new byte[currentChunkSize];
-                Array.Copy(bytes, sent, chunk, 0, currentChunkSize);
-
-                queue.Enqueue(new SaveTransferPacket()
-                {
-                    saveSize = bytes.Length,
-                    saveDataChunk = chunk,
-                    chunkId = i,
-                    chunkSize = chunk.Length,
-                    saveDataIndex = sent,
-                    totalChunks = totalChunks
-                });
-
-                sent += currentChunkSize;
-            }
-
-            saveTransferQueues[toClient] = queue;
-            Main.helper.Log($"Queued {totalChunks} save data chunks for client {toClient}");
         }
 
         private void OnApplicationQuit()

LoadSaveOverrides/MultiplayerSaveContainer.cs

@@ -27,39 +27,12 @@ namespace KCM.LoadSaveOverrides
             //this.PlayerSaveData = new PlayerSaveDataOverride().Pack(Player.inst);
             foreach (var player in Main.kCPlayers.Values)
             {
-                try
-                {
-                    if (player == null)
-                        continue;
+                Main.helper.Log($"Attempting to pack data for: " + player.name + $"({player.steamId})");
+                Main.helper.Log($"{player.inst.ToString()} {player.inst?.gameObject.name}");
+                this.players.Add(player.steamId, new Player.PlayerSaveData().Pack(player.inst));
+                kingdomNames.Add(player.steamId, player.kingdomName);
 
-                    if (string.IsNullOrWhiteSpace(player.steamId))
-                    {
-                        Main.helper.Log($"Skipping save for player with missing steamId (name={player.name ?? string.Empty})");
-                        continue;
-                    }
-
-                    if (player.inst == null)
-                    {
-                        Main.helper.Log($"Skipping save for player {player.name ?? string.Empty} ({player.steamId}) because Player.inst is null");
-                        continue;
-                    }
-
-                    Main.helper.Log($"Attempting to pack data for: {player.name} ({player.steamId})");
-                    string playerGoName = (player.inst.gameObject != null) ? player.inst.gameObject.name : string.Empty;
-                    Main.helper.Log($"Player object: {player.inst} {playerGoName}");
-
-                    this.players[player.steamId] = new Player.PlayerSaveData().Pack(player.inst);
-                    kingdomNames[player.steamId] = player.kingdomName ?? " ";
-
-                    Main.helper.Log($"{players[player.steamId] == null}");
-                }
-                catch (Exception ex)
-                {
-                    string steamId = (player != null && player.steamId != null) ? player.steamId : string.Empty;
-                    string name = (player != null && player.name != null) ? player.name : string.Empty;
-                    Main.helper.Log($"Error packing player data for save (steamId={steamId}, name={name})");
-                    Main.helper.Log(ex.ToString());
-                }
+                Main.helper.Log($"{players[player.steamId] == null}");
             }
 
             this.WorldSaveData = new World.WorldSaveData().Pack(World.inst);

Main.cs

@@ -55,112 +55,44 @@ namespace KCM
         public static Dictionary<string, KCPlayer> kCPlayers = new Dictionary<string, KCPlayer>();
         public static Dictionary<ushort, string> clientSteamIds = new Dictionary<ushort, string>();
 
-        private static readonly Dictionary<int, long> lastTeamIdLookupLogMs = new Dictionary<int, long>();
-        private static int resetInProgress = 0;
-
-        public static void ResetMultiplayerState(string reason = null)
-        {
-            if (Interlocked.Exchange(ref resetInProgress, 1) == 1)
-                return;
-
-            try
-            {
-                if (!string.IsNullOrEmpty(reason))
-                    helper?.Log($"ResetMultiplayerState: {reason}");
-
-                try { StateObserver.ClearAll(); } catch { }
-                try { SaveTransferPacket.ResetTransferState(); } catch { }
-
-                try
-                {
-                    LoadSaveLoadHook.memoryStreamHook = false;
-                    LoadSaveLoadHook.saveBytes = new byte[0];
-                    LoadSaveLoadHook.saveContainer = null;
-                }
-                catch { }
-
-                try { LoadSaveLoadAtPathHook.saveData = new byte[0]; } catch { }
-
-                try { LobbyManager.loadingSave = false; } catch { }
-
-                try
-                {
-                    foreach (var player in kCPlayers.Values)
-                    {
-                        if (player?.gameObject != null && player.gameObject.name != null && player.gameObject.name.Contains("Client Player"))
-                            UnityEngine.Object.Destroy(player.gameObject);
-                    }
-                }
-                catch { }
-
-                try { LobbyHandler.ClearChatEntries(); } catch { }
-                try { LobbyHandler.ClearPlayerList(); } catch { }
-
-                try
-                {
-                    kCPlayers.Clear();
-                    clientSteamIds.Clear();
-                }
-                catch { }
-
-                try { lastTeamIdLookupLogMs.Clear(); } catch { }
-
-                try
-                {
-                    if (KCClient.client != null && KCClient.client.IsConnected)
-                        KCClient.client.Disconnect();
-                }
-                catch { }
-
-                try
-                {
-                    if (KCServer.IsRunning)
-                        KCServer.server.Stop();
-                }
-                catch { }
-
-                try { ServerBrowser.registerServer = false; } catch { }
-            }
-            finally
-            {
-                Interlocked.Exchange(ref resetInProgress, 0);
-            }
-        }
-
         public static KCPlayer GetPlayerByClientID(ushort clientId)
         {
-            return kCPlayers[clientSteamIds[clientId]];
+            if (TryGetPlayerByClientID(clientId, out KCPlayer player))
+            {
+                return player;
+            }
+            return null;
+        }
+
+        public static bool TryGetPlayerByClientID(ushort clientId, out KCPlayer player)
+        {
+            player = null;
+            if (clientSteamIds.TryGetValue(clientId, out string steamId))
+            {
+                return kCPlayers.TryGetValue(steamId, out player);
+            }
+            return false;
         }
 
         public static Player GetPlayerByTeamID(int teamId) // Need to replace building / production types so that the correct player is used. IResourceStorage and IResourceProvider, and jobs
         {
-            KCPlayer match = kCPlayers.Values.FirstOrDefault(p =>
-                p != null &&
-                p.inst != null &&
-                p.inst.PlayerLandmassOwner != null &&
-                p.inst.PlayerLandmassOwner.teamId == teamId);
-
-            if (match != null && match.inst != null)
-                return match.inst;
-
-            if (KCServer.IsRunning || KCClient.client.IsConnected)
+            try
             {
-                long now = DateTimeOffset.Now.ToUnixTimeMilliseconds();
-                long last;
-                if (!lastTeamIdLookupLogMs.TryGetValue(teamId, out last) || (now - last) > 2000)
+                var player = kCPlayers.Values.FirstOrDefault(p => p.inst.PlayerLandmassOwner.teamId == teamId).inst;
+
+                return player;
+            }
+            catch (Exception e)
+            {
+                if (KCServer.IsRunning || KCClient.client.IsConnected)
                 {
-                    lastTeamIdLookupLogMs[teamId] = now;
-
-                    string myTeamId = (Player.inst != null && Player.inst.PlayerLandmassOwner != null)
-                        ? Player.inst.PlayerLandmassOwner.teamId.ToString()
-                        : "unknown";
-
-                    Main.helper.Log("Failed finding player by teamID: " + teamId + " My teamID is: " + myTeamId);
+                    Main.helper.Log("Failed finding player by teamID: " + teamId + " My teamID is: " + Player.inst.PlayerLandmassOwner.teamId);
                     Main.helper.Log(kCPlayers.Count.ToString());
-                    Main.helper.Log(string.Join(", ", kCPlayers.Values.Where(p => p != null && p.inst != null && p.inst.PlayerLandmassOwner != null).Select(p => p.inst.PlayerLandmassOwner.teamId.ToString())));
+                    Main.helper.Log(string.Join(", ", kCPlayers.Values.Select(p => p.inst.PlayerLandmassOwner.teamId.ToString())));
+                    Main.helper.Log(e.Message);
+                    Main.helper.Log(e.StackTrace);
                 }
             }
-
             return Player.inst;
         }
 
@@ -188,11 +120,51 @@ namespace KCM
         public static string PlayerSteamID = SteamUser.GetSteamID().ToString();
 
         public static KCMSteamManager KCMSteamManager = null;
+        public static LobbyManager lobbyManager = null;
         public static SteamServer steamServer = new SteamServer();
         public static Riptide.Transports.Steam.SteamClient steamClient = new Riptide.Transports.Steam.SteamClient(steamServer);
 
         public static ushort currentClient = 0;
 
+        public static void CleanupMultiplayerSession()
+        {
+            if (helper == null) return; // Avoid running if mod is not fully initialized
+
+            helper.Log("--- Starting Multiplayer Session Cleanup ---");
+
+            // Disconnect client
+            if (KCClient.client != null && KCClient.client.IsConnected)
+            {
+                helper.Log("Disconnecting client...");
+                KCClient.client.Disconnect();
+            }
+
+            // Stop server
+            if (KCServer.server != null && KCServer.IsRunning)
+            {
+                helper.Log("Stopping server...");
+                KCServer.server.Stop();
+            }
+
+            // Clear player lists
+            if (kCPlayers.Count > 0 || clientSteamIds.Count > 0)
+            {
+                helper.Log($"Clearing {kCPlayers.Count} KCPlayer entries and {clientSteamIds.Count} client steam IDs.");
+                kCPlayers.Clear();
+                clientSteamIds.Clear();
+            }
+
+            // Destroy persistent managers
+            if (lobbyManager != null)
+            {
+                helper.Log("Destroying LobbyManager.");
+                Destroy(lobbyManager.gameObject);
+                lobbyManager = null;
+            }
+
+            helper.Log("--- Multiplayer Session Cleanup Finished ---");
+        }
+
         #region "SceneLoaded"
         private void SceneLoaded(KCModHelper helper)
         {
@@ -205,14 +177,9 @@ namespace KCM
             KCMSteamManager = new GameObject("KCMSteamManager").AddComponent<KCMSteamManager>();
             DontDestroyOnLoad(KCMSteamManager);
 
-            var lobbyManager = new GameObject("LobbyManager").AddComponent<LobbyManager>();
+            lobbyManager = new GameObject("LobbyManager").AddComponent<LobbyManager>();
             DontDestroyOnLoad(lobbyManager);
 
-            //SteamFriends.InviteUserToGame(new CSteamID(76561198036307537), "test");
-            //SteamMatchmaking.lobby
-
-            //Main.helper.Log($"Timer duration for hazardpay {Player.inst.hazardPayWarmup.Duration}");
-
             try
             {
 
@@ -222,24 +189,62 @@ namespace KCM
 
                 Main.helper.Log(JsonConvert.SerializeObject(World.inst.mapSizeDefs, Formatting.Indented));
 
-                KaC_Button serverBrowser = new KaC_Button(Constants.MainMenuUI_T.Find("TopLevelUICanvas/TopLevel/Body/ButtonContainer/New").parent)
+                // Check if MainMenuUI_T is available
+                if (Constants.MainMenuUI_T == null)
+                {
+                    Main.helper.Log("MainMenuUI_T is null, cannot create Multiplayer button");
+                    return;
+                }
+
+                // Debug: Log the UI structure to find the correct path
+                Main.helper.Log($"MainMenuUI_T name: {Constants.MainMenuUI_T.name}");
+                Main.helper.Log($"MainMenuUI_T children count: {Constants.MainMenuUI_T.childCount}");
+                for (int i = 0; i < Constants.MainMenuUI_T.childCount; i++)
+                {
+                    var child = Constants.MainMenuUI_T.GetChild(i);
+                    Main.helper.Log($"  Child {i}: {child.name}");
+                    for (int j = 0; j < child.childCount; j++)
+                    {
+                        Main.helper.Log($"    SubChild {j}: {child.GetChild(j).name}");
+                    }
+                }
+
+                // Correct path based on debug output: MainMenuUI -> TopLevelUICanvas -> TopLevel -> Body -> ButtonContainer -> New
+                var buttonContainer = Constants.MainMenuUI_T.Find("TopLevelUICanvas/TopLevel/Body/ButtonContainer/New");
+                if (buttonContainer == null)
+                {
+                    Main.helper.Log("Button container not found at TopLevelUICanvas/TopLevel/Body/ButtonContainer/New");
+                    return;
+                }
+                Main.helper.Log($"Found button container at: {buttonContainer.name}");
+
+                var templateButton = buttonContainer.GetComponent<Button>();
+                if (templateButton == null)
+                {
+                    Main.helper.Log("Template button on container is missing Button component.");
+                    return;
+                }
+
+                KaC_Button serverBrowser = new KaC_Button(templateButton, buttonContainer.parent)
                 {
                     Name = "Multiplayer",
                     Text = "Multiplayer",
                     FirstSibling = true,
                     OnClick = () =>
                     {
-                        //Constants.MainMenuUI_T.Find("TopLevelUICanvas/TopLevel").gameObject.SetActive(false);
+                        Main.helper?.Log("Multiplayer button clicked");
                         SfxSystem.PlayUiSelect();
-
-                        //ServerBrowser.serverBrowserRef.SetActive(true);
                         TransitionTo(MenuState.ServerBrowser);
                     }
                 };
                 serverBrowser.Transform.SetSiblingIndex(2);
 
-
-                Destroy(Constants.MainMenuUI_T.Find("TopLevelUICanvas/TopLevel/Body/ButtonContainer/Kingdom Share").gameObject);
+                var kingdomShare = Constants.MainMenuUI_T.Find("TopLevelUICanvas/TopLevel/Body/ButtonContainer/Kingdom Share")
+                    ?? Constants.MainMenuUI_T.Find("MainMenu/TopLevel/Body/ButtonContainer/Kingdom Share");
+                if (kingdomShare != null)
+                {
+                    Destroy(kingdomShare.gameObject);
+                }
             }
             catch (Exception ex)
             {
@@ -306,11 +311,22 @@ namespace KCM
         {
             try
             {
-                ServerBrowser.serverBrowserRef.SetActive(state == MenuState.ServerBrowser);
-                ServerBrowser.serverLobbyRef.SetActive(state == MenuState.ServerLobby);
+                // Null checks for ServerBrowser references
+                if (ServerBrowser.serverBrowserRef != null)
+                    ServerBrowser.serverBrowserRef.SetActive(state == MenuState.ServerBrowser);
 
-                ServerBrowser.KCMUICanvas.gameObject.SetActive((int)state > 21);
-                helper.Log(((int)state > 21).ToString());
+                if (ServerBrowser.serverLobbyRef != null)
+                    ServerBrowser.serverLobbyRef.SetActive(state == MenuState.ServerLobby);
+
+                if (ServerBrowser.KCMUICanvas != null)
+                {
+                    ServerBrowser.KCMUICanvas.gameObject.SetActive((int)state > 21);
+                    if (state == MenuState.ServerBrowser)
+                    {
+                        Main.helper?.Log($"TransitionTo ServerBrowser: browserRef={(ServerBrowser.serverBrowserRef != null ? "ready" : "null")}, canvas={(ServerBrowser.KCMUICanvas != null ? "ready" : "null")}");
+                    }
+                    helper.Log(((int)state > 21).ToString());
+                }
 
                 GameState.inst.mainMenuMode.TransitionTo((MainMenuMode.State)state);
             }
@@ -340,9 +356,6 @@ namespace KCM
             helper.Log("Preload start in main");
             try
             {
-
-
-                //MainMenuPatches.Patch();
                 Main.helper = helper;
                 helper.Log(helper.modPath);
 
@@ -380,9 +393,6 @@ namespace KCM
 
                 if (newState != MainMenuMode.State.Uninitialized)
                     Main.menuState = (MenuState)newState;
-
-                if ((MenuState)newState == MenuState.Menu && (KCClient.client.IsConnected || KCServer.IsRunning))
-                    ResetMultiplayerState("Returned to main menu");
             }
         }
 
@@ -477,6 +487,8 @@ namespace KCM
         {
             public static void Postfix()
             {
+                // Your code here
+
                 // Get the name of the last method that called OnPlayerPlacement
                 List<string> strings = new List<string>();
 
@@ -623,12 +635,7 @@ namespace KCM
         {
             public static bool Prefix(Player __instance)
             {
-                var localPlayer = Player.inst;
-                if (KCClient.client.IsConnected &&
-                    __instance != null &&
-                    (localPlayer == null || __instance != localPlayer) &&
-                    __instance.gameObject != null &&
-                    __instance.gameObject.name.Contains("Client Player"))
+                if (KCClient.client.IsConnected && __instance.gameObject.name.Contains("Client Player") && !LobbyManager.loadingSave)
                 {
                     try
                     {
@@ -1284,7 +1291,6 @@ namespace KCM
                 if (KCServer.IsRunning)
                 {
                     Main.helper.Log("Trying to load multiplayer save");
-                    KCM.StateManagement.Observers.StateObserver.ClearAll();
                     LoadSave.LastLoadDirectory = path;
                     path = path + "/" + filename;
 
@@ -1294,18 +1300,11 @@ namespace KCM
                     {
                         BinaryFormatter bf = new BinaryFormatter();
                         bf.Binder = new MultiplayerSaveDeserializationBinder();
+                        saveData = File.ReadAllBytes(path);
                         Stream file = new FileStream(path, FileMode.Open);
                         try
                         {
-                            object deserialized = bf.Deserialize(file);
-                            MultiplayerSaveContainer loadData = deserialized as MultiplayerSaveContainer;
-                            if (loadData == null)
-                            {
-                                Main.helper.Log("Selected save is not a MultiplayerSaveContainer; falling back to vanilla load.");
-                                return true;
-                            }
-
-                            saveData = File.ReadAllBytes(path);
+                            MultiplayerSaveContainer loadData = (MultiplayerSaveContainer)bf.Deserialize(file);
                             loadData.Unpack(null);
                             Broadcast.OnLoadedEvent.Broadcast(new OnLoadedEvent());
                         }
@@ -1350,14 +1349,35 @@ namespace KCM
                 {
                     Main.helper.Log("Attempting to load save from server");
 
-                    using (MemoryStream ms = new MemoryStream(saveBytes))
+                    try
                     {
-                        BinaryFormatter bf = new BinaryFormatter();
-                        bf.Binder = new MultiplayerSaveDeserializationBinder();
-                        saveContainer = (MultiplayerSaveContainer)bf.Deserialize(ms);
+                        using (MemoryStream ms = new MemoryStream(saveBytes))
+                        {
+                            BinaryFormatter bf = new BinaryFormatter();
+                            bf.Binder = new MultiplayerSaveDeserializationBinder();
+                            saveContainer = (MultiplayerSaveContainer)bf.Deserialize(ms);
+                        }
+
+                        Main.helper.Log("Deserialize complete, calling Unpack...");
+                        saveContainer.Unpack(null);
+                        Main.helper.Log("Unpack complete!");
+                    }
+                    catch (Exception e)
+                    {
+                        Main.helper.Log("Error loading save from server");
+                        Main.helper.Log(e.Message);
+                        Main.helper.Log(e.StackTrace);
+                        if (e.InnerException != null)
+                        {
+                            Main.helper.Log("Inner exception: " + e.InnerException.Message);
+                            Main.helper.Log(e.InnerException.StackTrace);
+                        }
+                    }
+                    finally
+                    {
+                        memoryStreamHook = false;
                     }
 
-                    memoryStreamHook = false;
                     return false;
                 }
 
@@ -1415,33 +1435,19 @@ namespace KCM
                 {
                     Directory.CreateDirectory(LoadSave.GetSaveDir());
                     Guid guid = Guid.NewGuid();
-                    bool hasOverride = !string.IsNullOrWhiteSpace(pathOverride);
-                    string path = hasOverride ? pathOverride : Path.Combine(LoadSave.GetSaveDir(), guid.ToString());
-                    if (hasOverride && !Path.IsPathRooted(path))
-                        path = Path.Combine(LoadSave.GetSaveDir(), pathOverride);
+                    string path = (pathOverride != "") ? pathOverride : (LoadSave.GetSaveDir() + "/" + guid);
                     Directory.CreateDirectory(path);
                     Thread thread;
                     try
                     {
                         thread = new Thread(new ParameterizedThreadStart(OutToFile));
 
-                        MultiplayerSaveContainer packedData;
-                        try
-                        {
-                            packedData = new MultiplayerSaveContainer().Pack(null);
-                        }
-                        catch (Exception ex)
-                        {
-                            Main.helper.Log("Failed to pack multiplayer save data; falling back to vanilla save.");
-                            Main.helper.Log(ex.ToString());
-                            __result = null;
-                            return true;
-                        }
+                        MultiplayerSaveContainer packedData = new MultiplayerSaveContainer().Pack(null);
                         Broadcast.OnSaveEvent.Broadcast(new OnSaveEvent());
                         thread.Start(new OutData
                         {
                             LoadSaveContainer = packedData,
-                            Path = Path.Combine(path, "world")
+                            Path = path + "/world"
                         });
                     }
                     catch (Exception e)
@@ -1473,7 +1479,7 @@ namespace KCM
 
                     try
                     {
-                        World.inst.TakeScreenshot(Path.Combine(path, "cover"), new Func<int, int, Texture2D>(World.inst.Func_CaptureWorldShot), onCompleteCallback);
+                        World.inst.TakeScreenshot(path + "/cover", new Func<int, int, Texture2D>(World.inst.Func_CaptureWorldShot), onCompleteCallback);
                     }
                     catch (Exception e3)
                     {
@@ -1542,38 +1548,13 @@ namespace KCM
                         Main.helper.Log($"loading building: {building.FriendlyName}");
                         Main.helper.Log($" (teamid: {building.TeamID()})");
                         Main.helper.Log(p.ToString());
-
-                        try
+                        bool flag2 = building.GetComponent<Keep>() != null && building.TeamID() == p.PlayerLandmassOwner.teamId;
+                        Main.helper.Log("Set keep? " + flag2);
+                        if (flag2)
                         {
-                            p.PlayerLandmassOwner.TakeOwnership(building.LandMass());
-                        }
-                        catch (Exception e)
-                        {
-                            Main.helper.Log("Failed setting landmass ownership during load");
-                            Main.helper.Log(e.Message);
-                        }
-
-                        var keep = building.GetComponent<Keep>();
-                        bool shouldSetKeep = keep != null && p.keep == null;
-                        Main.helper.Log("Set keep? " + shouldSetKeep);
-                        if (shouldSetKeep)
-                        {
-                            p.keep = keep;
+                            p.keep = building.GetComponent<Keep>();
                             Main.helper.Log(p.keep.ToString());
                         }
-
-                        try
-                        {
-                            World.inst.PlaceFromLoad(building);
-                            structureData.UnpackStage2(building);
-                            building.SetVisibleForFog(false);
-                        }
-                        catch (Exception e)
-                        {
-                            Main.helper.Log("Error placing building into world during load");
-                            Main.helper.Log(e.Message);
-                            Main.helper.Log(e.StackTrace);
-                        }
                         __result = building;
                     }
                     else
@@ -1604,6 +1585,16 @@ namespace KCM
                     Main.helper.Log("Saving player creativeMode");
                     __instance.creativeMode = p.creativeMode;
 
+                    //cmo options not used for saving or loading in multiplayer
+                    /**for (int i = 0; i < p.cmoOptionsOn.Length; i++)
+                    {
+                        bool flag = p.cmoOptionsOn[i];
+                        if (flag)
+                        {
+                            __instance.cmoOptions.Add((Player.CreativeOptions)i);
+                        }
+                    }**/
+
                     Main.helper.Log("Saving player upgrades");
                     __instance.GetType().GetField("upgrades", bindingFlags).SetValue(__instance, new List<Player.UpgradeType>());
 
@@ -1745,9 +1736,10 @@ namespace KCM
                     __instance.JobCustomMaxEnabledFlag = new bool[World.inst.NumLandMasses][];
                     for (int lm = 0; lm < World.inst.NumLandMasses; lm++)
                     {
-                        __instance.JobFilledAvailable[lm] = new int[38];
-                        __instance.JobCustomMaxEnabledFlag[lm] = new bool[38];
-                        for (int n = 0; n < 38; n++)
+                        int numJobTypes = p.JobFilledAvailable.data[lm].GetLength(0);
+                        __instance.JobFilledAvailable[lm] = new int[numJobTypes];
+                        __instance.JobCustomMaxEnabledFlag[lm] = new bool[numJobTypes];
+                        for (int n = 0; n < numJobTypes; n++)
                         {
                             __instance.JobFilledAvailable[lm][n] = p.JobFilledAvailable.data[lm][n, 1];
                         }
@@ -2257,19 +2249,7 @@ namespace KCM
             {
                 Assembly assembly = typeof(Building).Assembly;
 
-                Type[] allTypes;
-                try
-                {
-                    allTypes = assembly.GetTypes();
-                }
-                catch (ReflectionTypeLoadException e)
-                {
-                    allTypes = e.Types.Where(t => t != null).ToArray();
-                }
-
-                var types = allTypes
-                    .Where(t => t != null && typeof(Building).IsAssignableFrom(t) && !t.IsAbstract)
-                    .ToArray();
+                Type[] types = new Type[] { typeof(Building) };
 
                 var methodsInNamespace = types
                     .SelectMany(t => t.GetMethods(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly).Where(m => !m.IsAbstract))
@@ -2314,56 +2294,6 @@ namespace KCM
             }
         }
 
-        [HarmonyPatch]
-        public class FieldSystemPlayerReferencePatch
-        {
-            static FieldInfo playerField;
-
-            static IEnumerable<MethodBase> TargetMethods()
-            {
-                var methodsInNamespace = typeof(FieldSystem)
-                    .GetMethods(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly)
-                    .Where(m => !m.IsAbstract)
-                    .ToList();
-
-                helper.Log("Methods in namespace: " + methodsInNamespace.Count);
-
-                return methodsInNamespace.ToArray().Cast<MethodBase>();
-            }
-
-            static IEnumerable<CodeInstruction> Transpiler(MethodBase method, IEnumerable<CodeInstruction> instructions)
-            {
-                if (playerField == null)
-                {
-                    var bindingFlags = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance;
-                    playerField = typeof(FieldSystem).GetFields(bindingFlags).FirstOrDefault(f => f.FieldType == typeof(Player));
-                }
-
-                if (playerField == null)
-                    return instructions;
-
-                int playerInstCount = 0;
-
-                var codes = new List<CodeInstruction>(instructions);
-                for (var i = 0; i < codes.Count; i++)
-                {
-                    if (codes[i].opcode == OpCodes.Ldsfld && codes[i].operand.ToString() == "Player inst")
-                    {
-                        playerInstCount++;
-
-                        codes[i].opcode = OpCodes.Ldarg_0;
-                        codes[i].operand = null;
-                        codes.Insert(++i, new CodeInstruction(OpCodes.Ldfld, playerField));
-                    }
-                }
-
-                if (playerInstCount > 0)
-                    Main.helper.Log($"Found {playerInstCount} static FieldSystem Player.inst references in {method.Name}");
-
-                return codes.AsEnumerable();
-            }
-        }
-
 
         [HarmonyPatch]
         public class PlayerPatch

Packets/Game/GameBuilding/BuildingRemovePacket.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Reflection;
+using UnityEngine;
+
+namespace KCM.Packets.Game.GameBuilding
+{
+    public class BuildingRemovePacket : Packet
+    {
+        public override ushort packetId => (ushort)KCM.Enums.Packets.BuildingRemove;
+
+        // Flag to prevent infinite loop when removing buildings from packet
+        public static bool isProcessingPacket = false;
+
+        public Guid guid { get; set; }
+
+        public override void HandlePacketClient()
+        {
+            if (clientId == KCClient.client.Id) return;
+
+            Main.helper.Log($"Received building remove packet for guid {guid} from {player.name}");
+
+            // Try to find the building in the player who owns it
+            Building building = player.inst.GetBuilding(guid);
+
+            if (building == null)
+            {
+                // Try to find it in any player's buildings
+                foreach (var kcp in Main.kCPlayers.Values)
+                {
+                    building = kcp.inst.GetBuilding(guid);
+                    if (building != null) break;
+                }
+            }
+
+            if (building == null)
+            {
+                Main.helper.Log($"Building with guid {guid} not found on client, may already be removed.");
+                return;
+            }
+
+            try
+            {
+                Main.helper.Log($"Removing building {building.UniqueName} at {building.transform.position}");
+
+                // Set flag to prevent sending packet back
+                isProcessingPacket = true;
+
+                // Set Player.inst to the correct player for this building
+                // This ensures the removal modifies the correct player's job lists
+                Player originalPlayer = Player.inst;
+                Player correctPlayer = Main.GetPlayerByBuilding(building);
+                if (correctPlayer != null)
+                {
+                    Player.inst = correctPlayer;
+                }
+
+                // Use reflection to call the Remove method from the game assembly
+                MethodInfo removeMethod = typeof(Building).GetMethod("Remove", BindingFlags.Public | BindingFlags.Instance);
+                if (removeMethod != null)
+                {
+                    removeMethod.Invoke(building, null);
+                }
+                else
+                {
+                    // Fallback: destroy the building GameObject directly
+                    Main.helper.Log("Remove method not found, using Destroy fallback");
+                    building.destroyedWhileInPlay = true;
+                    UnityEngine.Object.Destroy(building.gameObject);
+                }
+
+                // Restore original Player.inst
+                Player.inst = originalPlayer;
+                isProcessingPacket = false;
+            }
+            catch (Exception e)
+            {
+                isProcessingPacket = false;
+                Main.helper.Log($"Error removing building: {e.Message}");
+                Main.helper.Log(e.StackTrace);
+            }
+        }
+
+        public override void HandlePacketServer()
+        {
+            // Forward the remove packet to all other clients
+            SendToAll(clientId);
+        }
+    }
+}
+
+

Packets/Handlers/LobbyHandler.cs

@@ -35,7 +35,6 @@ namespace KCM.Packets.Handlers
                 if (!KCServer.IsRunning)
                 {
                     Main.kCPlayers.Clear();
-                    Main.clientSteamIds.Clear();
                 }
             }
             catch (Exception ex)

Packets/Handlers/PacketHandler.cs

@@ -84,9 +84,7 @@ namespace KCM.Packets.Handlers
                 {
 
                     IPacket p = (IPacket)Activator.CreateInstance(packet);
-                    var properties = packet.GetProperties(BindingFlags.Instance | BindingFlags.Public)
-                        .Where(prop => prop.Name != "packetId" && prop.Name != "sendMode")
-                        .ToArray();
+                    var properties = packet.GetProperties(BindingFlags.Instance | BindingFlags.Public).Where(prop => prop.Name != "packetId").ToArray();
                     Array.Sort(properties, (x, y) => String.Compare(x.Name, y.Name));
                     ushort id = (ushort)p.GetType().GetProperty("packetId").GetValue(p, null);
 
@@ -139,9 +137,7 @@ namespace KCM.Packets.Handlers
                 {
                     packet.HandlePacketServer();
 
-                    bool shouldRelay = packet.GetType().GetCustomAttributes(typeof(NoServerRelayAttribute), inherit: true).Length == 0;
-                    if (shouldRelay)
-                        ((Packet)packet).SendToAll();
+                    ((Packet)packet).SendToAll();
                 }
                 catch (Exception ex)
                 {
@@ -226,20 +222,14 @@ namespace KCM.Packets.Handlers
             try
             {
                 var packetRef = Packets[packet.packetId];
-
-                MessageSendMode sendMode = MessageSendMode.Reliable;
-                Packet basePacket = packet as Packet;
-                if (basePacket != null)
-                    sendMode = basePacket.sendMode;
-
-                Message message = Message.Create(sendMode, packet.packetId);
+                Message message = Message.Create(MessageSendMode.Reliable, packet.packetId);
 
                 foreach (var prop in packetRef.properties)
                 {
                     if (prop.PropertyType.IsEnum)
                     {
                         currentPropName = prop.Name;
-                        message.AddInt(Convert.ToInt32(prop.GetValue(packet, null)));
+                        message.AddInt((int)prop.GetValue(packet, null));
                     }
                     else if (prop.PropertyType == typeof(ushort))
                     {
@@ -471,7 +461,9 @@ namespace KCM.Packets.Handlers
                     if (prop.PropertyType.IsEnum)
                     {
                         int enumValue = message.GetInt();
-                        prop.SetValue(p, Enum.ToObject(prop.PropertyType, enumValue));
+                        string enumName = Enum.GetName(prop.PropertyType, enumValue);
+
+                        prop.SetValue(p, Enum.Parse(prop.PropertyType, enumName));
                     }
                     else if (prop.PropertyType == typeof(ushort))
                     {

Packets/Lobby/PlayerList.cs

@@ -35,17 +35,13 @@ namespace KCM.Packets.Lobby
 
                 Main.helper.Log("PlayerList: " + playersName[i] + " " + playersId[i] + " " + steamIds[i]);
 
-                KCPlayer player;
-                if (!Main.kCPlayers.TryGetValue(steamIds[i], out player) || player == null)
+                Main.kCPlayers.Add(steamIds[i], new KCPlayer(playersName[i], playersId[i], steamIds[i])
                 {
-                    player = new KCPlayer(playersName[i], playersId[i], steamIds[i]);
-                    Main.kCPlayers[steamIds[i]] = player;
-                }
-
-                player.name = playersName[i];
-                player.ready = playersReady[i];
-                player.banner = playersBanner[i];
-                player.kingdomName = playersKingdomName[i];
+                    name = playersName[i],
+                    ready = playersReady[i],
+                    banner = playersBanner[i],
+                    kingdomName = playersKingdomName[i]
+                });
 
 
                 if (Main.clientSteamIds.ContainsKey(playersId[i]))
@@ -53,8 +49,7 @@ namespace KCM.Packets.Lobby
                 else
                     Main.clientSteamIds.Add(playersId[i], steamIds[i]);
 
-                if (player.inst != null && player.inst.PlayerLandmassOwner != null)
-                    player.inst.PlayerLandmassOwner.SetBannerIdx(playersBanner[i]);
+                Main.kCPlayers[steamIds[i]].inst.PlayerLandmassOwner.SetBannerIdx(playersBanner[i]);
 
                 LobbyHandler.AddPlayerEntry(playersId[i]);
             }

Packets/Lobby/PlayerReady.cs

@@ -14,8 +14,6 @@ namespace KCM.Packets.Lobby
 
         public override void HandlePacketServer()
         {
-            if (player == null)
-                return;
             IsReady = !player.ready;
             //SendToAll(KCClient.client.Id);
 
@@ -24,8 +22,6 @@ namespace KCM.Packets.Lobby
 
         public override void HandlePacketClient()
         {
-            if (player == null)
-                return;
             player.ready = IsReady;
         }
     }

Packets/Lobby/SaveTransferPacket.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using KCM.StateManagement.Observers;
+using Riptide.Demos.Steam.PlayerHosted;
 using static KCM.Main;
 
 namespace KCM.Packets.Lobby
@@ -18,14 +18,6 @@ namespace KCM.Packets.Lobby
         public static bool loadingSave = false;
         public static int received = 0;
 
-        public static void ResetTransferState()
-        {
-            loadingSave = false;
-            received = 0;
-            saveData = new byte[1];
-            chunksReceived = new bool[1];
-        }
-
 
         public int chunkId { get; set; }
         public int chunkSize { get; set; }
@@ -38,116 +30,90 @@ namespace KCM.Packets.Lobby
 
         public override void HandlePacketClient()
         {
-            bool initialisingTransfer = !loadingSave ||
-                                       saveData == null ||
-                                       saveData.Length != saveSize ||
-                                       chunksReceived == null ||
-                                       chunksReceived.Length != totalChunks;
-
-            if (initialisingTransfer)
+            // Initialize on first chunk OR if arrays aren't properly sized yet
+            // This handles out-of-order packet delivery
+            if (!loadingSave || saveData.Length != saveSize || chunksReceived.Length != totalChunks)
             {
-                Main.helper.Log("Save Transfer started!");
+                Main.helper.Log($"Save Transfer initializing. saveSize={saveSize}, totalChunks={totalChunks}");
                 loadingSave = true;
-                received = 0;
-
-                StateObserver.ClearAll();
 
                 saveData = new byte[saveSize];
                 chunksReceived = new bool[totalChunks];
+                received = 0;
 
-                if (ServerLobbyScript.LoadingSave != null)
-                    ServerLobbyScript.LoadingSave.SetActive(true);
+                ServerLobbyScript.LoadingSave.SetActive(true);
             }
 
-            if (chunkId < 0 || chunkId >= totalChunks)
+            // Skip if we already received this chunk (duplicate packet)
+            if (chunksReceived[chunkId])
             {
-                Main.helper.Log($"Invalid save chunk id: {chunkId} / {totalChunks}");
-                return;
-            }
-
-            if (saveDataChunk == null)
-            {
-                Main.helper.Log($"Null save chunk data for chunk: {chunkId}");
-                return;
-            }
-
-            if (saveDataIndex < 0 || saveDataIndex + saveDataChunk.Length > saveData.Length)
-            {
-                Main.helper.Log($"Invalid save chunk write range: index={saveDataIndex} len={saveDataChunk.Length} size={saveData.Length}");
+                Main.helper.Log($"[SaveTransfer] Duplicate chunk {chunkId} received, skipping.");
                 return;
             }
 
             Array.Copy(saveDataChunk, 0, saveData, saveDataIndex, saveDataChunk.Length);
+
             chunksReceived[chunkId] = true;
+
             received += chunkSize;
 
-            float savePercent = saveSize > 0 ? (float)received / (float)saveSize : 0f;
-            if (ServerLobbyScript.ProgressBar != null)
-                ServerLobbyScript.ProgressBar.fillAmount = savePercent;
-            if (ServerLobbyScript.ProgressBarText != null)
-                ServerLobbyScript.ProgressBarText.text = (savePercent * 100).ToString("0.00") + "%";
-            if (ServerLobbyScript.ProgressText != null)
-                ServerLobbyScript.ProgressText.text = $"{((float)(received / 1000)).ToString("0.00")} KB / {((float)(saveSize / 1000)).ToString("0.00")} KB";
+            Main.helper.Log($"[SaveTransfer] Processed chunk {chunkId}/{totalChunks}. Received: {received} bytes of {saveSize}.");
 
-
-            if (chunkId + 1 == totalChunks)
+            // Update progress bar
+            if (saveSize > 0)
             {
-                Main.helper.Log($"Received last save transfer packet.");
+                float savePercent = (float)received / (float)saveSize;
+                string receivedKB = ((float)received / 1000f).ToString("0.00");
+                string totalKB = ((float)saveSize / 1000f).ToString("0.00");
 
-                Main.helper.Log(WhichIsNotComplete());
+                ServerLobbyScript.ProgressBar.fillAmount = savePercent;
+                ServerLobbyScript.ProgressBarText.text = (savePercent * 100).ToString("0.00") + "%";
+                ServerLobbyScript.ProgressText.text = $"{receivedKB} KB / {totalKB} KB";
+            }
+            else
+            {
+                ServerLobbyScript.ProgressBar.fillAmount = 0f;
+                ServerLobbyScript.ProgressBarText.text = "0.00%";
+                ServerLobbyScript.ProgressText.text = "0.00 KB / 0.00 KB";
             }
 
-            // Check if all chunks have been received
             if (IsTransferComplete())
             {
-                // Handle completed transfer here
                 Main.helper.Log("Save Transfer complete!");
 
+                // Reset the loading state before processing
+                loadingSave = false;
+
                 LoadSaveLoadHook.saveBytes = saveData;
                 LoadSaveLoadHook.memoryStreamHook = true;
 
                 LoadSave.Load();
 
+                GameState.inst.SetNewMode(GameState.inst.playingMode);
+                LobbyManager.loadingSave = false;
 
-                LoadSaveLoadHook.saveContainer.Unpack(null);
                 Broadcast.OnLoadedEvent.Broadcast(new OnLoadedEvent());
 
-                try
-                {
-                    new KCM.Packets.Network.ResyncRequestPacket { reason = "post-load" }.Send();
-                }
-                catch
-                {
-                }
+                ServerLobbyScript.LoadingSave.SetActive(false);
 
-                if (ServerLobbyScript.LoadingSave != null)
-                    ServerLobbyScript.LoadingSave.SetActive(false);
-
-                loadingSave = false;
-                received = 0;
-                saveData = new byte[1];
-                chunksReceived = new bool[1];
+                // Reset static state for next transfer
+                ResetTransferState();
             }
         }
 
+        public static void ResetTransferState()
+        {
+            saveData = new byte[1];
+            chunksReceived = new bool[1];
+            loadingSave = false;
+            received = 0;
+        }
+
         public static bool IsTransferComplete()
         {
             return chunksReceived.All(x => x == true);
         }
 
-        public static string WhichIsNotComplete()
-        {
-            string notComplete = "";
-            for (int i = 0; i < chunksReceived.Length; i++)
-            {
-                if (!chunksReceived[i])
-                {
-                    notComplete += i + ", ";
-                }
-            }
-            return notComplete;
-        }
-
         public override void HandlePacketServer()
         {
         }

Packets/Lobby/StartGame.cs

@@ -18,38 +18,26 @@ namespace KCM.Packets.Lobby
         {
             Main.helper.Log(GameState.inst.mainMenuMode.ToString());
 
-            // Hide server lobby
             Main.TransitionTo((MenuState)200);
 
-            // This is run when user clicks "accept" on choose your map screeen
-
             try
             {
-                if (!LobbyManager.loadingSave)
-                {
-                    SpeedControlUI.inst.SetSpeed(0);
+                SpeedControlUI.inst.SetSpeed(0);
 
-                    try
-                    {
-                        typeof(MainMenuMode).GetMethod("StartGame", BindingFlags.NonPublic | BindingFlags.Instance).Invoke(GameState.inst.mainMenuMode, null);
-                    }
-                    catch (Exception ex)
-                    {
-                        Main.helper.Log(ex.Message.ToString());
-                        Main.helper.Log(ex.ToString());
-                    }
-
-                    SpeedControlUI.inst.SetSpeed(0);
-                }
-                else
+                try
                 {
-                    LobbyManager.loadingSave = false;
-                    GameState.inst.SetNewMode(GameState.inst.playingMode);
+                    typeof(MainMenuMode).GetMethod("StartGame", BindingFlags.NonPublic | BindingFlags.Instance).Invoke(GameState.inst.mainMenuMode, null);
                 }
+                catch (Exception ex)
+                {
+                    Main.helper.Log(ex.Message.ToString());
+                    Main.helper.Log(ex.ToString());
+                }
+
+                SpeedControlUI.inst.SetSpeed(0);
             }
             catch (Exception ex)
             {
-                // Handle exception here
                 Main.helper.Log(ex.Message.ToString());
                 Main.helper.Log(ex.ToString());
             }
@@ -57,47 +45,18 @@ namespace KCM.Packets.Lobby
 
         public override void HandlePacketClient()
         {
-            Start();
+            if (!LobbyManager.loadingSave)
+            {
+                Start();
+            }
+            else
+            {
+                ServerLobbyScript.LoadingSave.SetActive(true);
+            }
         }
 
         public override void HandlePacketServer()
         {
-            //Start();
-
-
-            /*AIBrainsContainer.PreStartAIConfig aiConfig = new AIBrainsContainer.PreStartAIConfig();
-            int count = 0;
-            for (int i = 0; i < RivalKingdomSettingsUI.inst.rivalItems.Length; i++)
-            {
-                RivalItemUI r = RivalKingdomSettingsUI.inst.rivalItems[i];
-                bool flag = r.Enabled && !r.Locked;
-                if (flag)
-                {
-                    count++;
-                }
-            }
-            int idx = 0;
-            aiConfig.startData = new AIBrainsContainer.PreStartAIConfig.AIStartData[count];
-            for (int j = 0; j < RivalKingdomSettingsUI.inst.rivalItems.Length; j++)
-            {
-                RivalItemUI item = RivalKingdomSettingsUI.inst.rivalItems[j];
-                bool flag2 = item.Enabled && !item.Locked;
-                if (flag2)
-                {
-                    aiConfig.startData[idx] = new AIBrainsContainer.PreStartAIConfig.AIStartData();
-                    aiConfig.startData[idx].landmass = item.flag.landmass;
-                    aiConfig.startData[idx].bioCode = item.bannerIdx;
-                    aiConfig.startData[idx].personalityKey = PersonalityCollection.aiPersonalityKeys[0];
-                    aiConfig.startData[idx].skillLevel = item.GetSkillLevel();
-                    idx++;
-                }
-            }
-            AIBrainsContainer.inst.aiStartInfo = aiConfig;
-            bool isControllerActive = GamepadControl.inst.isControllerActive;
-            if (isControllerActive)
-            {
-                ConsoleCursorMenu.inst.PrepForGamepad();
-            }*/
         }
     }
 }

Packets/Lobby/WorldSeed.cs

@@ -33,14 +33,6 @@ namespace KCM.Packets.Lobby
                 World.inst.Generate(Seed);
                 Vector3 center = World.inst.GetCellData(World.inst.GridWidth / 2, World.inst.GridHeight / 2).Center;
                 Cam.inst.SetTrackingPos(center);
-
-                try
-                {
-                    new KCM.Packets.Network.ResyncRequestPacket { reason = "post-world-seed" }.Send();
-                }
-                catch
-                {
-                }
             }
             catch (Exception e)
             {

Packets/Network/ClientConnected.cs

@@ -51,20 +51,6 @@ namespace KCM.Packets.Network
         {
             Main.helper.Log("Server Player Connected: " + Name + " Id: " + clientId + " SteamID: " + SteamId);
 
-            KCPlayer player;
-            if (Main.kCPlayers.TryGetValue(SteamId, out player))
-            {
-                player.id = clientId;
-                player.name = Name;
-                player.steamId = SteamId;
-            }
-            else
-            {
-                Main.kCPlayers[SteamId] = new KCPlayer(Name, clientId, SteamId);
-            }
-
-            Main.clientSteamIds[clientId] = SteamId;
-
             List<KCPlayer> list = Main.kCPlayers.Select(x => x.Value).OrderBy(x => x.id).ToList();
 
             if (list.Count > 0)
@@ -92,7 +78,33 @@ namespace KCM.Packets.Network
                     return;
 
                 byte[] bytes = LoadSaveLoadAtPathHook.saveData;
-                KCServer.EnqueueSaveTransfer(clientId, bytes);
+                int chunkSize = 900; // 900 bytes per chunk to fit within packet size limit
+
+                List<byte[]> chunks = SplitByteArrayIntoChunks(bytes, chunkSize);
+                Main.helper.Log("Save Transfer started!");
+
+                int sent = 0;
+                int packetsSent = 0;
+
+                for (int i = 0; i < chunks.Count; i++)
+                {
+                    var chunk = chunks[i];
+
+
+                    new SaveTransferPacket()
+                    {
+                        saveSize = bytes.Length,
+                        saveDataChunk = chunk,
+                        chunkId = i,
+                        chunkSize = chunk.Length,
+                        saveDataIndex = sent,
+                        totalChunks = chunks.Count
+                    }.SendReliable(clientId);
+                    packetsSent++;
+                    sent += chunk.Length;
+                }
+
+                Main.helper.Log($"Sent {packetsSent} save data chunks to client");
             }
             else
             {

Packets/Network/ResyncRequestPacket.cs

@@ -1,35 +0,0 @@
-using KCM.Attributes;
-using KCM.StateManagement.Sync;
-using System;
-
-namespace KCM.Packets.Network
-{
-    [NoServerRelay]
-    public class ResyncRequestPacket : Packet
-    {
-        public override ushort packetId => (ushort)Enums.Packets.ResyncRequest;
-
-        public string reason { get; set; }
-
-        public override void HandlePacketClient()
-        {
-        }
-
-        public override void HandlePacketServer()
-        {
-            try
-            {
-                if (!KCServer.IsRunning)
-                    return;
-
-                SyncManager.SendResyncToClient(clientId, reason);
-            }
-            catch (Exception ex)
-            {
-                Main.helper.Log("Error handling ResyncRequestPacket on server");
-                Main.helper.Log(ex.ToString());
-            }
-        }
-    }
-}
-

Packets/Network/ServerHandshake.cs

@@ -38,8 +38,7 @@ namespace KCM.Packets.Network
 
             Main.helper.Log("Sending client connected. Client ID is: " + clientId);
 
-            Main.kCPlayers[Main.PlayerSteamID] = new KCPlayer(KCClient.inst.Name, clientId, Main.PlayerSteamID);
-            Main.clientSteamIds[clientId] = Main.PlayerSteamID;
+            Main.kCPlayers.Add(Main.PlayerSteamID, new KCPlayer(KCClient.inst.Name, clientId, Main.PlayerSteamID));
 
             Player.inst.PlayerLandmassOwner.teamId = clientId * 10 + 2;
 

Packets/Packet.cs

@@ -11,21 +11,22 @@ namespace KCM.Packets
     {
         public abstract ushort packetId { get; }
         public ushort clientId { get; set; }
-        public virtual Riptide.MessageSendMode sendMode => Riptide.MessageSendMode.Reliable;
 
         public KCPlayer player
         {
             get
             {
-                string steamId;
-                if (!Main.clientSteamIds.TryGetValue(clientId, out steamId) || string.IsNullOrEmpty(steamId))
+                KCPlayer p = null;
+
+                if (!Main.clientSteamIds.ContainsKey(clientId))
                     return null;
+                if (Main.kCPlayers.TryGetValue(Main.GetPlayerByClientID(clientId).steamId, out p))
+                    return p;
+                else
+                {
+                    Main.helper.Log($"Error getting player from packet {packetId} {this.GetType().Name} from {clientId}");
+                }
 
-                KCPlayer player;
-                if (Main.kCPlayers.TryGetValue(steamId, out player))
-                    return player;
-
-                Main.helper.Log($"Error getting player from packet {packetId} {GetType().Name} from {clientId}");
                 return null;
             }
         }
@@ -103,6 +104,37 @@ namespace KCM.Packets
             }
         }
 
+        public void SendReliable(ushort toClient)
+        {
+            try
+            {
+                if (KCServer.IsRunning && toClient != 0)
+                {
+                    KCServer.server.Send(PacketHandler.SerialisePacket(this), toClient, true);
+                }
+            }
+            catch (Exception ex)
+            {
+                Main.helper.Log($"Error sending reliable packet {packetId} {this.GetType().Name} from {clientId}");
+
+                Main.helper.Log("----------------------- Main exception -----------------------");
+                Main.helper.Log(ex.ToString());
+                Main.helper.Log("----------------------- Main message -----------------------");
+                Main.helper.Log(ex.Message);
+                Main.helper.Log("----------------------- Main stacktrace -----------------------");
+                Main.helper.Log(ex.StackTrace);
+                if (ex.InnerException != null)
+                {
+                    Main.helper.Log("----------------------- Inner exception -----------------------");
+                    Main.helper.Log(ex.InnerException.ToString());
+                    Main.helper.Log("----------------------- Inner message -----------------------");
+                    Main.helper.Log(ex.InnerException.Message);
+                    Main.helper.Log("----------------------- Inner stacktrace -----------------------");
+                    Main.helper.Log(ex.InnerException.StackTrace);
+                }
+            }
+        }
+
         public abstract void HandlePacketServer();
         public abstract void HandlePacketClient();
     }

Packets/State/BuildingSnapshotPacket.cs

@@ -1,33 +0,0 @@
-using KCM.StateManagement.Sync;
-using System;
-
-namespace KCM.Packets.State
-{
-    public class BuildingSnapshotPacket : Packet
-    {
-        public override ushort packetId => (ushort)Enums.Packets.BuildingSnapshot;
-
-        public byte[] payload { get; set; }
-
-        public override void HandlePacketClient()
-        {
-            try
-            {
-                if (payload == null || payload.Length == 0)
-                    return;
-
-                SyncManager.ApplyBuildingSnapshot(payload);
-            }
-            catch (Exception ex)
-            {
-                Main.helper.Log("Error applying BuildingSnapshotPacket");
-                Main.helper.Log(ex.ToString());
-            }
-        }
-
-        public override void HandlePacketServer()
-        {
-        }
-    }
-}
-

Packets/State/BuildingStatePacket.cs

@@ -11,7 +11,6 @@ namespace KCM.Packets.State
     public class BuildingStatePacket : Packet
     {
         public override ushort packetId => (ushort)Enums.Packets.BuildingStatePacket;
-        public override Riptide.MessageSendMode sendMode => Riptide.MessageSendMode.Unreliable;
 
         public string customName { get; set; }
         public Guid guid { get; set; }

Packets/State/ResourceSnapshotPacket.cs

@@ -1,37 +0,0 @@
-using KCM.StateManagement.Sync;
-using System;
-using System.Collections.Generic;
-
-namespace KCM.Packets.State
-{
-    public class ResourceSnapshotPacket : Packet
-    {
-        public override ushort packetId => (ushort)Enums.Packets.ResourceSnapshot;
-
-        public override Riptide.MessageSendMode sendMode => Riptide.MessageSendMode.Unreliable;
-
-        public List<int> resourceTypes { get; set; }
-        public List<int> amounts { get; set; }
-
-        public override void HandlePacketClient()
-        {
-            try
-            {
-                if (KCClient.client.IsConnected && KCClient.client.Id == clientId)
-                    return;
-
-                SyncManager.ApplyResourceSnapshot(resourceTypes, amounts);
-            }
-            catch (Exception ex)
-            {
-                Main.helper.Log("Error applying ResourceSnapshotPacket");
-                Main.helper.Log(ex.ToString());
-            }
-        }
-
-        public override void HandlePacketServer()
-        {
-        }
-    }
-}
-

README.md

@@ -1,75 +1,38 @@
-# KCM (Kingdoms and Castles Multiplayer)
+# Kingdoms and Castles Multiplayer Mod Fixes
 
-Ez a repó egy *Kingdoms and Castles* multiplayer mod forrása. A mod Steam lobby + Riptide alapú hálózattal próbálja a világot és a játékosok akcióit több kliens között szinkronban tartani.
+This document summarizes the fixes and improvements implemented to enhance the stability and functionality of the multiplayer mod for Kingdoms and Castles.
 
-Ha a `output.txt` logban `Compilation failed` szerepel, akkor a mod **nem töltődött be**, és semmi nem fog szinkronizálódni (ilyenkor tipikusan C# szintaxis / runtime-kompatibilitási hiba van a forrásban).
+## Implemented Fixes:
 
-## Mit szinkronizál a mod? (jelenlegi állapot)
+### 1. Improved Lobby Stability
+- **Issue:** Previously, joining a multiplayer lobby could lead to an immediate crash (NullReferenceException in `PlayerEntryScript.cs`).
+- **Fix:** Corrected the initialization order of UI components in `PlayerEntryScript.cs` to prevent NullReferenceExceptions, ensuring stable lobby entry.
 
-**Lobby / kapcsolat**
-- Játékos csatlakozás/leválás, player lista, ready állapot.
-- Szerver beállítások (név, max players, seed, world opciók).
-- Chat és rendszerüzenetek.
+### 2. Enhanced Session Cleanup
+- **Issue:** Users previously had to restart the entire game after leaving a multiplayer session to join or host a new one. This was due to residual game state and an aggressive cleanup that inadvertently shut down Steamworks.
+- **Fix:** Implemented a comprehensive `CleanupMultiplayerSession()` routine in `Main.cs`. This routine now properly resets static mod data (player lists, client/server states), and, crucially, no longer destroys the core `KCMSteamManager` (Steamworks API manager). This allows for seamless transitions between multiplayer sessions without game restarts.
 
-**Világ indítás**
-- World seed szétküldése és world generálás a klienseken.
-- (Beállítástól függően) keep elhelyezés csomagból.
+### 3. Optimized Building Synchronization Performance
+- **Issue:** Rapid changes in building state (e.g., during construction) could generate excessive network traffic, potentially contributing to "poor connection" issues.
+- **Fix:** Implemented a throttling mechanism in `BuildingStateManager.cs`. Building state updates are now limited to 10 times per second per building, significantly reducing network spam while maintaining visual fluidity.
 
-**Gameplay alap**
-- Épület lerakás események (alap meta: `uniqueName`, `guid`, pozíció/rotáció).
-- Épület állapot frissítések “snapshot” jelleggel (`BuildingStatePacket`): built/placed, constructionProgress, life, stb.
-- Néhány globális esemény: idősebesség változtatás, időjárás váltás, fa kivágás (repo verziótól függően).
-- Host oldalon periodikus *resource snapshot* korrigálás (ha drift/desync van, visszahúzza a klienst).
+### 4. Resolved Villager Freezing
+- **Issue:** Villagers would sometimes freeze during gameplay, despite other game elements functioning correctly. This was caused by the game attempting to synchronize the state of already destroyed building components, leading to a cascade of errors.
+- **Fix:** Added a robust null check in `BuildingStateManager.cs`. If an observed building has been destroyed, its associated observer is now properly de-registered (by destroying its GameObject), preventing further errors and ensuring continuous game logic for villagers and other entities. This also handles cases where buildings are replaced (e.g., construction completed).
 
-**Mentés betöltés (host → kliens)**
-- Host oldalon a mentés byte-ok chunkolva kerülnek kiküldésre (`SaveTransferPacket`).
-- Kliens oldalon érkezés után `LoadSave.Load()` + `MultiplayerSaveContainer.Unpack()` fut.
-- Ha a kiválasztott mentés nem multiplayer container (vanilla mentés), a host fallback-ként átadja a normál betöltést.
+### 5. Fixed Map Desynchronization
+- **Issue:** When starting a new multiplayer game, clients often generated a different map than the host, even if the seed was specified. This was due to the host not sending the definitive world seed at the critical moment.
+- **Fix:** Modified `ServerLobbyScript.cs` to ensure that when the host clicks "Start Game", the current world seed (either from UI input or newly generated) is explicitly sent to all clients via a `WorldSeed` packet *before* the game starts. This guarantees all players generate the exact same map.
 
-## Mi nincs (még) rendesen szinkronizálva? (gyakori desync okok)
+### 6. Reliable Save Game Transfer
+- **Issue:** Loading a saved multiplayer game would often fail for clients, resulting in an incomplete save file and desynchronized gameplay. This occurred because save file chunks were sent unreliably over the network.
+- **Fix:** Changed the save game chunk transfer in `ClientConnected.cs` to use Riptide's `Reliable` message send mode. This ensures that all parts of the save file are guaranteed to arrive at the client, allowing for complete and successful save game loading.
 
-Ezek okozzák a tipikus “farm termel, de nem látszik” / “resource nem frissül” / “animáció hiányzik” jelenségeket:
-- **Erőforrás-logika és szállítás**: raktárkészletek, haul/cart routing, villager “viszem/lerakom” animációk nincsenek teljes állapotban szinkronizálva.
-- **Villager/job részletek**: current task, target, carried resource, pathing cache, részfeladat-állapot.
-- **Field/Farm belső állapot**: growth stage, harvest queue, field regisztráció edge case-ek.
-- **UI / kliens oldali state**: beragadt menük, promptok (pl. “rakd le a kezdő épületet”), lokális UI state nem hálózati adat.
-- **AI brains / nem-player rendszerek**: részben vagy egyáltalán nincs “szerver az igazság” modell.
+### 7. Compilation Errors & Warnings Addressed
+- All reported compilation errors and warnings (including issues with `Packet.Send` overloads and `World.SeedFromText`) have been investigated and resolved, ensuring the mod compiles cleanly.
 
-## Mit érdemes még hozzáadni? (roadmap)
+## Pending Task:
 
-Ha cél a stabil “load utáni sync” és kevesebb vizuális desync:
-- **Resource szinkron**: raktárak készlete, termelés/fogyasztás tick eredménye, szállítási queue események (event-based vagy periodikus snapshot).
-- **Villager szinkron**: villager state machine + carried resource + célpont; vagy determinisztikus szerver oldali szimuláció és kliens “replay”.
-- **Farm/Field szinkron**: field állapot (growth/ready/harvest), aratás események explicit hálózati üzenetként.
-- **Robusztus reconnect**: kilépés egy sessionből → másik lobby csatlakozás restart nélkül (minden statikus állapot, observer, transfer state, player cache teljes resetje).
-- **Debug eszközök**: desync detektor (hash/snapshot összehasonlítás), több log a load/sync pontokra.
-
-## Telepítés
-
-- Hostnak és **minden kliensnek ugyanaz a mod verzió** kell.
-- Workshop verzió frissítés felülírhatja a módosításokat. Ajánlott:
-  - kimásolni a modot a játék `...\\KingdomsAndCastles_Data\\mods\\` mappájába egy külön névvel,
-  - és a mod menüben kikapcsolni a Workshop verziót.
-- Változtatások után **teljes játék újraindítás** javasolt.
-
-## Hibaelhárítás
-
-**Log helye:** a mod mappájában gyakran van `output.txt`.
-
-Nézd ezeket a kulcssorokat:
-- `Compilation failed` → a mod nem fordult le, nincs multiplayer.
-- `Save Transfer started/complete` → mentés átküldés/betöltés állapota.
-- `Error loading save` / `LoadError` → sérült/rossz típusú mentés, vagy verzió eltérés.
-
-Bug reporthoz küldd el:
-- a hiba környéki 50–100 sort a `output.txt`-ből,
-- host/kliens szerep, játék verzió, mod verzió,
-- új világban vagy mentés betöltés után jelentkezik-e.
-
-## Fejlesztés
-
-Repo-szabályok és szerkezet: `AGENTS.md`.
-
-### Gyors resync
-
-A lobby chatben írd be: `/resync` – a kliens kér egy resync-et a hosttól (resource + building + villager “teleport” snapshot).
+### Resource Synchronization
+- **Goal:** Implement synchronization for player resources (Gold, Wood, Stone, Food) to ensure all players see consistent resource counts.
+- **Status:** Awaiting confirmation from the user regarding the exact `FreeResourceType` enum names (`Wood`, `Stone`, `Food`) to proceed with implementation.

RiptideSteamTransport/LobbyManager.cs

@@ -1,7 +1,6 @@
 using KCM;
 using KCM.Enums;
 using KCM.Packets.Handlers;
-using KCM.StateManagement.Observers;
 using Steamworks;
 using UnityEngine;
 
@@ -154,7 +153,20 @@ namespace Riptide.Demos.Steam.PlayerHosted
             //NetworkManager.Singleton.StopServer();
             //NetworkManager.Singleton.DisconnectClient();
             SteamMatchmaking.LeaveLobby(lobbyId);
-            Main.ResetMultiplayerState("LeaveLobby");
+
+            if (KCClient.client.IsConnected)
+                KCClient.client.Disconnect();
+
+            Main.helper.Log("clear players");
+            Main.kCPlayers.Clear();
+            LobbyHandler.ClearPlayerList();
+            LobbyHandler.ClearChatEntries();
+            Main.helper.Log("end clear players");
+
+            if (KCServer.IsRunning)
+                KCServer.server.Stop();
+
+
 
             Main.TransitionTo(MenuState.ServerBrowser);
             ServerBrowser.registerServer = false;

ServerBrowser/ServerBrowser.cs

@@ -299,13 +299,35 @@ namespace KCM
 
             try
             {
-                GameObject kcmUICanvas = Instantiate(Constants.MainMenuUI_T.Find("TopLevelUICanvas").gameObject);
+                if (Constants.MainMenuUI_T == null)
+                {
+                    Main.helper.Log("MainMenuUI_T is null in ServerBrowser");
+                    return;
+                }
+
+                var topLevelCanvas = ResolveMenuCanvas();
+                if (topLevelCanvas == null)
+                {
+                    Main.helper.Log("Failed to resolve top-level menu canvas in ServerBrowser");
+                    return;
+                }
+
+                GameObject kcmUICanvas = Instantiate(topLevelCanvas.gameObject);
 
                 for (int i = 0; i < kcmUICanvas.transform.childCount; i++)
                     Destroy(kcmUICanvas.transform.GetChild(i).gameObject);
 
                 kcmUICanvas.name = "KCMUICanvas";
-                kcmUICanvas.transform.SetParent(Constants.MainMenuUI_T);
+                kcmUICanvas.transform.SetParent(Constants.MainMenuUI_T, false);
+                kcmUICanvas.transform.SetAsLastSibling();
+                kcmUICanvas.SetActive(false);
+
+                var canvasComponent = kcmUICanvas.GetComponent<Canvas>();
+                if (canvasComponent != null)
+                {
+                    canvasComponent.overrideSorting = true;
+                    canvasComponent.sortingOrder = 999;
+                }
 
                 KCMUICanvas = kcmUICanvas.transform;
 
@@ -322,6 +344,8 @@ namespace KCM
                 serverLobbyPlayerRef = serverLobbyRef.transform.Find("Container/PlayerList/Viewport/Content");
                 serverLobbyChatRef = serverLobbyRef.transform.Find("Container/PlayerChat/Viewport/Content");
                 serverLobbyRef.SetActive(false);
+                serverBrowserRef.transform.SetAsLastSibling();
+                serverLobbyRef.transform.SetAsLastSibling();
                 //browser.transform.position = new Vector3(0, 0, 0);
 
 
@@ -435,6 +459,29 @@ namespace KCM
             }
         }
 
+        private Transform ResolveMenuCanvas()
+        {
+            string[] candidatePaths =
+            {
+                "TopLevelUICanvas",
+                "TopLevel",
+                "MainMenu/TopLevel/TopLevelUICanvas",
+                "MainMenu/TopLevel"
+            };
+
+            foreach (var path in candidatePaths)
+            {
+                var transform = Constants.MainMenuUI_T.Find(path);
+                if (transform != null)
+                {
+                    Main.helper.Log($"ServerBrowser: using canvas path '{path}'.");
+                    return transform;
+                }
+            }
+
+            return null;
+        }
+
         private void Preload(KCModHelper helper)
         {
             helper.Log("Hello?");

ServerLobby/LobbyChat/ChatEntryScript.cs

@@ -51,24 +51,12 @@ namespace KCM.ServerLobby.LobbyChat
         {
             try
             {
-                if (banner == null)
-                    return;
-
-                string steamId;
-                if (!Main.clientSteamIds.TryGetValue(Client, out steamId))
-                    return;
-
                 KCPlayer player;
-                if (!Main.kCPlayers.TryGetValue(steamId, out player) || player == null)
-                    return;
+                Main.kCPlayers.TryGetValue(Main.GetPlayerByClientID(Client).steamId, out player);
 
-                if (World.inst == null || World.inst.liverySets == null)
-                    return;
-
-                if (player.banner < 0 || player.banner >= World.inst.liverySets.Count)
-                    return;
-
-                banner.texture = World.inst.liverySets[player.banner].banners;
+                var bannerTexture = World.inst.liverySets[player.banner].banners;
+                
+                banner.texture = bannerTexture;
             }
             catch (Exception ex)
             {

ServerLobby/PlayerEntryScript.cs

@@ -29,7 +29,7 @@ namespace KCM.ServerLobby
 
             transform.Find("PlayerBanner").GetComponent<Button>().onClick.AddListener(() =>
             {
-                Main.TransitionTo(MenuState.NameAndBanner);
+                Main.TransitionTo(MenuState.NameAndBanner);//ChooseBannerUI Hooks required, as well as townnameui
             });
         }
 
@@ -37,39 +37,21 @@ namespace KCM.ServerLobby
         {
             try
             {
-                if (banner == null)
+                // First check if the client still exists
+                if (!Main.TryGetPlayerByClientID(Client, out KCPlayer player) || player == null)
                 {
-                    var bannerTransform = transform.Find("PlayerBanner");
-                    if (bannerTransform == null)
-                        return;
-                    banner = bannerTransform.GetComponent<RawImage>();
-                    if (banner == null)
-                        return;
+                    // Client no longer exists, stop the repeating invoke and destroy this entry
+                    CancelInvoke("SetValues");
+                    Destroy(gameObject);
+                    return;
                 }
 
-                string steamId;
-                if (!Main.clientSteamIds.TryGetValue(Client, out steamId))
-                    return;
+                transform.Find("PlayerName").GetComponent<TextMeshProUGUI>().text = player.name;
+                transform.Find("Ready").gameObject.SetActive(player.ready);
 
-                KCPlayer player;
-                if (!Main.kCPlayers.TryGetValue(steamId, out player) || player == null)
-                    return;
+                var bannerTexture = World.inst.liverySets[player.banner].banners;
 
-                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.Count)
-                    return;
-
-                banner.texture = World.inst.liverySets[player.banner].banners;
+                banner.texture = bannerTexture;
             }
             catch (Exception ex)
             {

ServerLobby/ServerLobbyScript.cs

@@ -142,7 +142,6 @@ namespace KCM
                 {
 
                     Main.helper.Log("Disable all");
-                    //StartGameButton.gameObject.SetActive(false);
                     StartGameButton.onClick.RemoveAllListeners();
                     StartGameButton.GetComponentInChildren<TextMeshProUGUI>().text = "Ready";
                     StartGameButton.onClick.AddListener(() =>
@@ -187,6 +186,32 @@ namespace KCM
                     StartGameButton.GetComponentInChildren<TextMeshProUGUI>().text = "Start";
                     StartGameButton.onClick.AddListener(() =>
                     {
+                        int definitiveSeed;
+                        if (string.IsNullOrWhiteSpace(WorldSeed.text))
+                        {
+                            World.inst.Generate();
+                            definitiveSeed = World.inst.seed;
+                        }
+                        else
+                        {
+                            if (int.TryParse(WorldSeed.text, out int parsedSeed))
+                            {
+                                definitiveSeed = parsedSeed;
+                                World.inst.Generate(definitiveSeed);
+                            }
+                            else
+                            {
+                                Main.helper.Log($"Invalid seed '{WorldSeed.text}' entered. Generating a random seed.");
+                                World.inst.Generate();
+                                definitiveSeed = World.inst.seed;
+                            }
+                        }
+
+                        new WorldSeed()
+                        {
+                            Seed = definitiveSeed
+                        }.SendToAll(KCClient.client.Id);
+
                         new StartGame().SendToAll();
 
                         if (PlacementType.value == 0 && !LobbyManager.loadingSave)
@@ -219,21 +244,6 @@ namespace KCM
                 {
                     if (ChatInput.text.Length > 0)
                     {
-                        if (ChatInput.text.Trim().Equals("/resync", StringComparison.OrdinalIgnoreCase))
-                        {
-                            try
-                            {
-                                new KCM.Packets.Network.ResyncRequestPacket { reason = "manual:/resync" }.Send();
-                                LobbyHandler.AddSystemMessage("Resync requested.");
-                            }
-                            catch
-                            {
-                            }
-
-                            ChatInput.text = "";
-                            return;
-                        }
-
                         new ChatMessage()
                         {
                             PlayerName = KCClient.inst.Name,

StateManagement/BuildingState/BuildingStateManager.cs

@@ -1,4 +1,4 @@
-using KCM.Packets;
+using KCM.Packets;
 using KCM.Packets.State;
 using KCM.StateManagement.Observers;
 using System;
@@ -6,12 +6,15 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using UnityEngine;
 using static KCM.StateManagement.Observers.Observer;
 
 namespace KCM.StateManagement.BuildingState
 {
     public class BuildingStateManager
     {
+        private static readonly Dictionary<Guid, float> lastUpdateTime = new Dictionary<Guid, float>();
+        private const float UpdateInterval = 0.1f; // 10 times per second
 
         public static void BuildingStateChanged(object sender, StateUpdateEventArgs args)
         {
@@ -23,9 +26,29 @@ namespace KCM.StateManagement.BuildingState
             try
             {
                 Observer observer = (Observer)sender;
-
                 Building building = (Building)observer.state;
 
+                if (building == null)
+                {
+                    if(observer != null)
+                    {
+                        UnityEngine.Object.Destroy(observer.gameObject);
+                    }
+                    return;
+                }
+
+                Guid guid = building.guid;
+
+                if (lastUpdateTime.ContainsKey(guid) && Time.time < lastUpdateTime[guid] + UpdateInterval)
+                {
+                    return; // Not time to update yet
+                }
+
+                if (!lastUpdateTime.ContainsKey(guid))
+                    lastUpdateTime.Add(guid, Time.time);
+                else
+                    lastUpdateTime[guid] = Time.time;
+
                 //Main.helper.Log("Should send building network update for: " + building.UniqueName);
 
                 new BuildingStatePacket()
@@ -57,4 +80,4 @@ namespace KCM.StateManagement.BuildingState
             }
         }
     }
-}
+}

StateManagement/Observers/StateObserver.cs

@@ -12,24 +12,6 @@ namespace KCM.StateManagement.Observers
     {
         public static Dictionary<int, IObserver> observers = new Dictionary<int, IObserver>();
 
-        public static void ClearAll()
-        {
-            foreach (var observer in observers.Values)
-            {
-                try
-                {
-                    var component = observer as Component;
-                    if (component != null)
-                        UnityEngine.Object.Destroy(component.gameObject);
-                }
-                catch
-                {
-                }
-            }
-
-            observers.Clear();
-        }
-
         public static void RegisterObserver<T>(T instance, string[] monitoredFields, EventHandler<StateUpdateEventArgs> eventHandler = null, EventHandler<StateUpdateEventArgs> sendUpdateHandler = null)
         {
             if (observers.ContainsKey(instance.GetHashCode()))

StateManagement/Sync/SyncManager.cs

@@ -1,558 +0,0 @@
-using Assets.Code;
-using KCM.Packets.Game.GameVillager;
-using KCM.Packets.State;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using UnityEngine;
-
-namespace KCM.StateManagement.Sync
-{
-    public static class SyncManager
-    {
-        private const int ResourceBroadcastIntervalMs = 2000;
-        private const int MaxBuildingSnapshotBytes = 30000;
-        private const int MaxVillagerTeleportsPerResync = 400;
-
-        private static long lastResourceBroadcastMs;
-
-        private static FieldInfo freeResourceAmountField;
-        private static MethodInfo resourceAmountGetMethod;
-        private static MethodInfo resourceAmountSetMethod;
-        private static MethodInfo freeResourceManagerMaybeRefresh;
-        private static MethodInfo fieldSystemMaybeRefresh;
-
-        public static void ServerUpdate()
-        {
-            if (!KCServer.IsRunning)
-                return;
-
-            long now = DateTimeOffset.Now.ToUnixTimeMilliseconds();
-            if ((now - lastResourceBroadcastMs) < ResourceBroadcastIntervalMs)
-                return;
-
-            lastResourceBroadcastMs = now;
-
-            try
-            {
-                ResourceSnapshotPacket snapshot = BuildResourceSnapshotPacket();
-                if (snapshot == null)
-                    return;
-
-                snapshot.clientId = KCClient.client != null ? KCClient.client.Id : (ushort)0;
-
-                // Exclude host/local client from receiving its own snapshot.
-                ushort exceptId = KCClient.client != null ? KCClient.client.Id : (ushort)0;
-                snapshot.SendToAll(exceptId);
-            }
-            catch (Exception ex)
-            {
-                Main.helper.Log("Error broadcasting resource snapshot");
-                Main.helper.Log(ex.ToString());
-            }
-        }
-
-        public static void SendResyncToClient(ushort toClient, string reason)
-        {
-            if (!KCServer.IsRunning)
-                return;
-
-            Main.helper.Log($"Resync requested by client {toClient} ({reason ?? ""})");
-
-            try
-            {
-                ResourceSnapshotPacket snapshot = BuildResourceSnapshotPacket();
-                if (snapshot != null)
-                {
-                    snapshot.clientId = KCClient.client != null ? KCClient.client.Id : (ushort)0;
-                    snapshot.Send(toClient);
-                }
-            }
-            catch (Exception ex)
-            {
-                Main.helper.Log("Error sending resource resync");
-                Main.helper.Log(ex.ToString());
-            }
-
-            try
-            {
-                SendBuildingSnapshotToClient(toClient);
-            }
-            catch (Exception ex)
-            {
-                Main.helper.Log("Error sending building resync");
-                Main.helper.Log(ex.ToString());
-            }
-
-            try
-            {
-                SendVillagerTeleportSnapshotToClient(toClient);
-            }
-            catch (Exception ex)
-            {
-                Main.helper.Log("Error sending villager resync");
-                Main.helper.Log(ex.ToString());
-            }
-        }
-
-        private static ResourceSnapshotPacket BuildResourceSnapshotPacket()
-        {
-            List<int> types;
-            List<int> amounts;
-            if (!TryReadFreeResources(out types, out amounts))
-                return null;
-
-            return new ResourceSnapshotPacket
-            {
-                resourceTypes = types,
-                amounts = amounts
-            };
-        }
-
-        private static void SendBuildingSnapshotToClient(ushort toClient)
-        {
-            List<Building> buildings = new List<Building>();
-
-            foreach (var p in Main.kCPlayers.Values)
-            {
-                if (p == null || p.inst == null)
-                    continue;
-
-                try
-                {
-                    var list = p.inst.Buildings;
-                    for (int i = 0; i < list.Count; i++)
-                    {
-                        Building b = list.data[i];
-                        if (b != null)
-                            buildings.Add(b);
-                    }
-                }
-                catch
-                {
-                }
-            }
-
-            if (buildings.Count == 0)
-                return;
-
-            int idx = 0;
-            while (idx < buildings.Count)
-            {
-                byte[] payload = BuildBuildingSnapshotPayload(buildings, ref idx);
-                if (payload == null || payload.Length == 0)
-                    break;
-
-                new BuildingSnapshotPacket { payload = payload }.Send(toClient);
-            }
-        }
-
-        private static byte[] BuildBuildingSnapshotPayload(List<Building> buildings, ref int startIndex)
-        {
-            using (var ms = new MemoryStream())
-            using (var bw = new BinaryWriter(ms))
-            {
-                long countPos = ms.Position;
-                bw.Write(0); // placeholder for record count
-                int written = 0;
-
-                for (; startIndex < buildings.Count; startIndex++)
-                {
-                    Building b = buildings[startIndex];
-                    if (b == null)
-                        continue;
-
-                    long before = ms.Position;
-                    try
-                    {
-                        WriteBuildingRecord(bw, b);
-                        written++;
-                    }
-                    catch
-                    {
-                        ms.Position = before;
-                        ms.SetLength(before);
-                    }
-
-                    if (ms.Length >= MaxBuildingSnapshotBytes)
-                    {
-                        startIndex++;
-                        break;
-                    }
-                }
-
-                long endPos = ms.Position;
-                ms.Position = countPos;
-                bw.Write(written);
-                ms.Position = endPos;
-
-                return ms.ToArray();
-            }
-        }
-
-        private static void WriteBuildingRecord(BinaryWriter bw, Building b)
-        {
-            bw.Write(b.TeamID());
-            bw.Write(b.guid.ToByteArray());
-
-            bw.Write(b.UniqueName ?? "");
-            bw.Write(b.customName ?? "");
-
-            Vector3 globalPosition = b.transform.position;
-            Quaternion rotation = b.transform.childCount > 0 ? b.transform.GetChild(0).rotation : b.transform.rotation;
-            Vector3 localPosition = b.transform.childCount > 0 ? b.transform.GetChild(0).localPosition : Vector3.zero;
-
-            bw.Write(globalPosition.x);
-            bw.Write(globalPosition.y);
-            bw.Write(globalPosition.z);
-
-            bw.Write(rotation.x);
-            bw.Write(rotation.y);
-            bw.Write(rotation.z);
-            bw.Write(rotation.w);
-
-            bw.Write(localPosition.x);
-            bw.Write(localPosition.y);
-            bw.Write(localPosition.z);
-
-            bw.Write(b.IsBuilt());
-            bw.Write(b.IsPlaced());
-            bw.Write(b.Open);
-            bw.Write(b.doBuildAnimation);
-            bw.Write(b.constructionPaused);
-            bw.Write(b.constructionProgress);
-
-            float resourceProgress = 0f;
-            try
-            {
-                var field = b.GetType().GetField("resourceProgress", BindingFlags.NonPublic | BindingFlags.Instance);
-                if (field != null)
-                    resourceProgress = (float)field.GetValue(b);
-            }
-            catch { }
-            bw.Write(resourceProgress);
-
-            bw.Write(b.Life);
-            bw.Write(b.ModifiedMaxLife);
-
-            int yearBuilt = 0;
-            try
-            {
-                var field = b.GetType().GetField("yearBuilt", BindingFlags.NonPublic | BindingFlags.Instance);
-                if (field != null)
-                    yearBuilt = (int)field.GetValue(b);
-            }
-            catch { }
-            bw.Write(yearBuilt);
-
-            bw.Write(b.decayProtection);
-        }
-
-        public static void ApplyBuildingSnapshot(byte[] payload)
-        {
-            using (var ms = new MemoryStream(payload))
-            using (var br = new BinaryReader(ms))
-            {
-                int count = br.ReadInt32();
-                for (int i = 0; i < count; i++)
-                {
-                    int teamId = br.ReadInt32();
-                    Guid guid = new Guid(br.ReadBytes(16));
-
-                    string uniqueName = br.ReadString();
-                    string customName = br.ReadString();
-
-                    Vector3 globalPosition = new Vector3(br.ReadSingle(), br.ReadSingle(), br.ReadSingle());
-                    Quaternion rotation = new Quaternion(br.ReadSingle(), br.ReadSingle(), br.ReadSingle(), br.ReadSingle());
-                    Vector3 localPosition = new Vector3(br.ReadSingle(), br.ReadSingle(), br.ReadSingle());
-
-                    bool built = br.ReadBoolean();
-                    bool placed = br.ReadBoolean();
-                    bool open = br.ReadBoolean();
-                    bool doBuildAnimation = br.ReadBoolean();
-                    bool constructionPaused = br.ReadBoolean();
-                    float constructionProgress = br.ReadSingle();
-                    float resourceProgress = br.ReadSingle();
-                    float life = br.ReadSingle();
-                    float modifiedMaxLife = br.ReadSingle();
-                    int yearBuilt = br.ReadInt32();
-                    float decayProtection = br.ReadSingle();
-
-                    ApplyBuildingRecord(teamId, guid, uniqueName, customName, globalPosition, rotation, localPosition, built, placed, open, doBuildAnimation, constructionPaused, constructionProgress, resourceProgress, life, modifiedMaxLife, yearBuilt, decayProtection);
-                }
-            }
-
-            TryRefreshFieldSystem();
-        }
-
-        private static void ApplyBuildingRecord(int teamId, Guid guid, string uniqueName, string customName, Vector3 globalPosition, Quaternion rotation, Vector3 localPosition, bool built, bool placed, bool open, bool doBuildAnimation, bool constructionPaused, float constructionProgress, float resourceProgress, float life, float modifiedMaxLife, int yearBuilt, float decayProtection)
-        {
-            Player p = Main.GetPlayerByTeamID(teamId);
-            if (p == null)
-                return;
-
-            Building building = null;
-            try { building = p.GetBuilding(guid); } catch { }
-            if (building == null)
-                return;
-
-            try
-            {
-                building.UniqueName = uniqueName;
-                building.customName = customName;
-
-                building.transform.position = globalPosition;
-                if (building.transform.childCount > 0)
-                {
-                    building.transform.GetChild(0).rotation = rotation;
-                    building.transform.GetChild(0).localPosition = localPosition;
-                }
-                else
-                {
-                    building.transform.rotation = rotation;
-                }
-
-                SetPrivateFieldValue(building, "built", built);
-                SetPrivateFieldValue(building, "placed", placed);
-                SetPrivateFieldValue(building, "resourceProgress", resourceProgress);
-                SetPrivateFieldValue(building, "yearBuilt", yearBuilt);
-
-                building.Open = open;
-                building.doBuildAnimation = doBuildAnimation;
-                building.constructionPaused = constructionPaused;
-                building.constructionProgress = constructionProgress;
-                building.Life = life;
-                building.ModifiedMaxLife = modifiedMaxLife;
-                building.decayProtection = decayProtection;
-            }
-            catch
-            {
-            }
-        }
-
-        private static void SetPrivateFieldValue(object obj, string fieldName, object value)
-        {
-            if (obj == null)
-                return;
-
-            Type type = obj.GetType();
-            FieldInfo field = type.GetField(fieldName, BindingFlags.NonPublic | BindingFlags.Instance);
-            if (field != null)
-                field.SetValue(obj, value);
-        }
-
-        private static void SendVillagerTeleportSnapshotToClient(ushort toClient)
-        {
-            try
-            {
-                int sent = 0;
-                for (int i = 0; i < Villager.villagers.Count; i++)
-                {
-                    if (sent >= MaxVillagerTeleportsPerResync)
-                        break;
-
-                    Villager v = Villager.villagers.data[i];
-                    if (v == null)
-                        continue;
-
-                    new VillagerTeleportTo
-                    {
-                        guid = v.guid,
-                        pos = v.Pos
-                    }.Send(toClient);
-
-                    sent++;
-                }
-            }
-            catch
-            {
-            }
-        }
-
-        public static void ApplyResourceSnapshot(List<int> resourceTypes, List<int> amounts)
-        {
-            if (resourceTypes == null || amounts == null)
-                return;
-
-            int count = Math.Min(resourceTypes.Count, amounts.Count);
-            if (count == 0)
-                return;
-
-            for (int i = 0; i < count; i++)
-            {
-                try
-                {
-                    FreeResourceType type = (FreeResourceType)resourceTypes[i];
-                    int amount = amounts[i];
-                    TryWriteFreeResource(type, amount);
-                }
-                catch
-                {
-                }
-            }
-
-            TryRefreshFreeResourceUI();
-        }
-
-        private static bool TryReadFreeResources(out List<int> types, out List<int> amounts)
-        {
-            types = new List<int>();
-            amounts = new List<int>();
-
-            if (FreeResourceManager.inst == null)
-                return false;
-
-            try
-            {
-                Array values = Enum.GetValues(typeof(FreeResourceType));
-                foreach (var v in values)
-                {
-                    FreeResourceType t = (FreeResourceType)v;
-                    int amount;
-                    if (!TryReadFreeResource(t, out amount))
-                        continue;
-
-                    types.Add((int)t);
-                    amounts.Add(amount);
-                }
-            }
-            catch
-            {
-                return false;
-            }
-
-            return types.Count > 0;
-        }
-
-        private static bool EnsureResourceReflection()
-        {
-            if (resourceAmountGetMethod != null && resourceAmountSetMethod != null && freeResourceAmountField != null)
-                return true;
-
-            try
-            {
-                Type raType = typeof(ResourceAmount);
-                resourceAmountGetMethod = raType.GetMethod("Get", BindingFlags.Public | BindingFlags.Instance, null, new[] { typeof(FreeResourceType) }, null);
-                resourceAmountSetMethod = raType.GetMethod("Set", BindingFlags.Public | BindingFlags.Instance, null, new[] { typeof(FreeResourceType), typeof(int) }, null);
-
-                var bindingFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
-                freeResourceAmountField = typeof(FreeResourceManager).GetFields(bindingFlags).FirstOrDefault(f => f.FieldType == raType);
-                if (freeResourceAmountField == null)
-                {
-                    var prop = typeof(FreeResourceManager).GetProperties(bindingFlags).FirstOrDefault(p => p.PropertyType == raType && p.GetGetMethod(true) != null);
-                    if (prop != null)
-                    {
-                        // Fallback: treat property getter as "field" by caching getter only.
-                        // We won't be able to set back reliably in this case.
-                    }
-                }
-
-                freeResourceManagerMaybeRefresh = typeof(FreeResourceManager).GetMethods(bindingFlags)
-                    .FirstOrDefault(m => m.GetParameters().Length == 0 && m.ReturnType == typeof(void) && (m.Name.IndexOf("Refresh", StringComparison.OrdinalIgnoreCase) >= 0 || m.Name.IndexOf("Update", StringComparison.OrdinalIgnoreCase) >= 0));
-            }
-            catch
-            {
-                return false;
-            }
-
-            return freeResourceAmountField != null && resourceAmountGetMethod != null && resourceAmountSetMethod != null;
-        }
-
-        private static bool TryReadFreeResource(FreeResourceType type, out int amount)
-        {
-            amount = 0;
-
-            if (!EnsureResourceReflection())
-                return false;
-
-            try
-            {
-                object ra = freeResourceAmountField.GetValue(FreeResourceManager.inst);
-                if (ra == null)
-                    return false;
-
-                object result = resourceAmountGetMethod.Invoke(ra, new object[] { type });
-                if (result is int)
-                {
-                    amount = (int)result;
-                    return true;
-                }
-
-                return false;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        private static bool TryWriteFreeResource(FreeResourceType type, int amount)
-        {
-            if (!EnsureResourceReflection())
-                return false;
-
-            try
-            {
-                object ra = freeResourceAmountField.GetValue(FreeResourceManager.inst);
-                if (ra == null)
-                    return false;
-
-                resourceAmountSetMethod.Invoke(ra, new object[] { type, amount });
-                if (typeof(ResourceAmount).IsValueType)
-                    freeResourceAmountField.SetValue(FreeResourceManager.inst, ra);
-
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        private static void TryRefreshFreeResourceUI()
-        {
-            try
-            {
-                if (!EnsureResourceReflection())
-                    return;
-
-                if (freeResourceManagerMaybeRefresh != null && FreeResourceManager.inst != null)
-                    freeResourceManagerMaybeRefresh.Invoke(FreeResourceManager.inst, null);
-            }
-            catch
-            {
-            }
-        }
-
-        private static void TryRefreshFieldSystem()
-        {
-            try
-            {
-                if (Player.inst == null || Player.inst.fieldSystem == null)
-                    return;
-
-                if (fieldSystemMaybeRefresh == null)
-                {
-                    var bindingFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
-                    fieldSystemMaybeRefresh = Player.inst.fieldSystem.GetType()
-                        .GetMethods(bindingFlags)
-                        .FirstOrDefault(m =>
-                            m.ReturnType == typeof(void) &&
-                            m.GetParameters().Length == 0 &&
-                            (m.Name.IndexOf("Rebuild", StringComparison.OrdinalIgnoreCase) >= 0 ||
-                             m.Name.IndexOf("Refresh", StringComparison.OrdinalIgnoreCase) >= 0) &&
-                            m.Name.IndexOf("Reset", StringComparison.OrdinalIgnoreCase) < 0 &&
-                            m.Name.IndexOf("Clear", StringComparison.OrdinalIgnoreCase) < 0);
-                }
-
-                if (fieldSystemMaybeRefresh != null)
-                    fieldSystemMaybeRefresh.Invoke(Player.inst.fieldSystem, null);
-            }
-            catch
-            {
-            }
-        }
-    }
-}

UI/KaC_Button.cs

@@ -15,6 +15,11 @@ namespace KCM.UI
     class KaC_Button
     {
         public Button Button = null;
+        private static readonly string[] ButtonPaths =
+        {
+            "TopLevelUICanvas/TopLevel/Body/ButtonContainer/New",
+            "MainMenu/TopLevel/Body/ButtonContainer/New" // fallback for older versions
+        };
 
         public string Name
         {
@@ -84,14 +89,18 @@ namespace KCM.UI
             set => Transform.SetSiblingIndex(value);
         }
 
-        public KaC_Button(Transform parent = null)
-        {
-            Button b = Constants.MainMenuUI_T.Find("TopLevelUICanvas/TopLevel/Body/ButtonContainer/New").GetComponent<Button>();
+        public KaC_Button(Transform parent = null) : this(null, parent) { }
 
-            if (parent == null)
-                Button = GameObject.Instantiate(b);
-            else
-                Button = GameObject.Instantiate(b, parent);
+        public KaC_Button(Button b, Transform parent = null)
+        {
+            var templateButton = ResolveTemplateButton(b);
+
+            if (templateButton == null)
+                throw new InvalidOperationException("Template button not found in main menu UI.");
+
+            Button = parent == null
+                ? GameObject.Instantiate(templateButton)
+                : GameObject.Instantiate(templateButton, parent);
 
             foreach (Localize Localize in Button.GetComponentsInChildren<Localize>())
                 GameObject.Destroy(Localize);
@@ -99,20 +108,27 @@ namespace KCM.UI
             Button.onClick = new Button.ButtonClickedEvent();
         }
 
-        public KaC_Button(Button b, Transform parent = null)
+        private static Button ResolveTemplateButton(Button providedButton)
         {
-            if (b == null)
-                b = Constants.MainMenuUI_T.Find("TopLevelUICanvas/TopLevel/Body/ButtonContainer/New").GetComponent<Button>();
+            if (providedButton != null)
+                return providedButton;
 
-            if (parent == null)
-                Button = GameObject.Instantiate(b);
-            else
-                Button = GameObject.Instantiate(b, parent);
+            foreach (var path in ButtonPaths)
+            {
+                var transform = Constants.MainMenuUI_T?.Find(path);
+                if (transform == null)
+                    continue;
 
-            foreach (Localize Localize in Button.GetComponentsInChildren<Localize>())
-                GameObject.Destroy(Localize);
+                var button = transform.GetComponent<Button>();
+                if (button != null)
+                {
+                    Main.helper?.Log($"Using menu button template at '{path}'.");
+                    return button;
+                }
+            }
 
-            Button.onClick = new Button.ButtonClickedEvent();
+            Main.helper?.Log("Failed to find menu button template for KaC_Button.");
+            return null;
         }
 
         public override string ToString()