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

most elvileg el indul és javítottuk ezueket a szarokat.

Browse Source
This commit is contained in:
devbeni
2025-12-13 23:09:07 +01:00
parent f82ae76a3e
commit 8edea198cd
4 changed files with 179 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
StateManagement/BuildingState/BuildingStateManager.cs
View File

@@ -1,4 +1,4 @@
using KCM.Packets;
using KCM.Packets;
using KCM.Packets.State;
using KCM.StateManagement.Observers;
using System;
@@ -6,6 +6,7 @@ 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

65
StateManagement/Sync/SyncManager.cs
View File

@@ -760,22 +760,11 @@ namespace KCM.StateManagement.Sync
{
bool needsCorrection = false;
// Check if villager is stuck (not moving for too long while having a job)
if (v.workerJob != null && v.brain != null)
// Check if villager position is invalid
if (float.IsNaN(v.Pos.x) || float.IsNaN(v.Pos.y) || float.IsNaN(v.Pos.z))
{
// Check if villager is in invalid state
if (v.brain.currentAction == null && v.workerJob.active)
{
needsCorrection = true;
stuckVillagers++;
}
// Check if villager position is invalid
if (float.IsNaN(v.Pos.x) || float.IsNaN(v.Pos.y) || float.IsNaN(v.Pos.z))
{
needsCorrection = true;
stuckVillagers++;
}
needsCorrection = true;
stuckVillagers++;
}
if (needsCorrection)
@@ -783,25 +772,11 @@ namespace KCM.StateManagement.Sync
// Correct villager state
try
{
// Restart AI brain
if (v.brain != null)
{
v.brain.Restart();
}
// Ensure valid position
if (float.IsNaN(v.Pos.x) || float.IsNaN(v.Pos.y) || float.IsNaN(v.Pos.z))
{
// Teleport to a safe position near their workplace or home
Vector3 safePos = Vector3.zero;
if (v.workerJob != null && v.workerJob.employer != null)
{
safePos = v.workerJob.employer.transform.position;
}
else
{
safePos = new Vector3(World.inst.GridWidth / 2, 0, World.inst.GridHeight / 2);
}
// Teleport to a safe position
Vector3 safePos = new Vector3(World.inst.GridWidth / 2, 0, World.inst.GridHeight / 2);
v.TeleportTo(safePos);
}
@@ -823,6 +798,34 @@ namespace KCM.StateManagement.Sync
{
Main.helper.Log($"Villager validation: Found {stuckVillagers} stuck villagers, corrected {correctedVillagers}");
}
// Force villager system refresh if we found issues
if (stuckVillagers > 0 && VillagerSystem.inst != null)
{
try
{
var villagerSystemType = typeof(VillagerSystem);
var refreshMethods = villagerSystemType.GetMethods(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic | System.Reflection.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(VillagerSystem.inst, null);
Main.helper.Log($"Called VillagerSystem.{method.Name} for validation");
}
catch { }
}
}
}
catch (Exception e)
{
Main.helper.Log($"Error refreshing villager system: {e.Message}");
}
}
}
catch (Exception e)
{