devbeni/K-C-Multiplayer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

második proba

Browse Source
This commit is contained in:
devbeni
2025-12-13 23:10:50 +01:00
parent 8edea198cd
commit e91ae0fc99
1 changed files with 46 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
LoadSaveOverrides/MultiplayerSaveContainer.cs
View File

@@ -474,89 +474,70 @@ namespace KCM.LoadSaveOverrides
{ {
Main.helper.Log("Starting villager state resync after load"); Main.helper.Log("Starting villager state resync after load");
// Wait a frame for all systems to initialize // Simple resync without async complications
System.Threading.Tasks.Task.Delay(100).ContinueWith(_ => Main.helper.Log("Performing villager resync");
// Force villager system refresh
if (VillagerSystem.inst != null)
{ {
try try
{ {
Main.helper.Log("Performing delayed villager resync"); var villagerSystemType = typeof(VillagerSystem);
var refreshMethods = villagerSystemType.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)
.Where(m => m.Name.Contains("Refresh") || m.Name.Contains("Update") || m.Name.Contains("Restart"));
// Resync all villager positions and states foreach (var method in refreshMethods)
for (int i = 0; i < Villager.villagers.Count; i++)
{ {
Villager v = Villager.villagers.data[i]; if (method.GetParameters().Length == 0)
if (v != null)
{ {
try try
{ {
// Force position update method.Invoke(VillagerSystem.inst, null);
Vector3 currentPos = v.Pos; Main.helper.Log($"Called VillagerSystem.{method.Name}()");
v.TeleportTo(currentPos);
// Use reflection to check and fix villager state
var villagerType = typeof(Villager);
var workerJobField = villagerType.GetField("workerJob", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
var workerJob = workerJobField?.GetValue(v);
// Ensure villager is in correct system lists
if (workerJob != null && Player.inst != null)
{
if (!Player.inst.Workers.Contains(v))
{
Player.inst.Workers.Add(v);
}
}
else if (workerJob == null && Player.inst != null)
{
if (!Player.inst.Homeless.Contains(v))
{
Player.inst.Homeless.Add(v);
}
}
}
catch (Exception e)
{
Main.helper.Log($"Error resyncing villager {i}: {e.Message}");
} }
catch { }
} }
} }
// Force job system to re-evaluate all jobs
if (JobSystem.inst != null)
{
try
{
var jobSystemUpdateType = typeof(JobSystem);
var updateMethods = jobSystemUpdateType.GetMethods(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)
.Where(m => m.Name.Contains("Update") || m.Name.Contains("Refresh"));
foreach (var method in updateMethods)
{
try
{
method.Invoke(JobSystem.inst, null);
Main.helper.Log($"Called JobSystem.{method.Name} for resync");
}
catch { }
}
}
catch (Exception e)
{
Main.helper.Log($"Error updating job system: {e.Message}");
}
}
Main.helper.Log("Villager state resync completed");
} }
catch (Exception e) catch (Exception e)
{ {
Main.helper.Log($"Error in delayed villager resync: {e.Message}"); Main.helper.Log($"Error refreshing villager system: {e.Message}");
} }
}); }
// Force job system refresh
if (JobSystem.inst != null)
{
try
{
var jobSystemRefreshType = typeof(JobSystem);
var refreshMethods = jobSystemRefreshType.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)
.Where(m => m.Name.Contains("Refresh") || m.Name.Contains("Update") || m.Name.Contains("Restart"));
foreach (var method in refreshMethods)
{
if (method.GetParameters().Length == 0)
{
try
{
method.Invoke(JobSystem.inst, null);
Main.helper.Log($"Called JobSystem.{method.Name}()");
}
catch { }
}
}
}
catch (Exception e)
{
Main.helper.Log($"Error refreshing job system: {e.Message}");
}
}
Main.helper.Log("Villager state resync completed");
} }
catch (Exception e) catch (Exception e)
{ {
Main.helper.Log($"Error starting villager resync: {e.Message}"); Main.helper.Log($"Error during villager resync: {e.Message}");
} }
// Ensure villager is in correct system lists // Ensure villager is in correct system lists