fix(citizen-server-impl): prevent entity ownership desync on bucket changes and reduce migration timeout

Author: DaniGP17

code/components/citizen-server-impl/src/state/ServerGameState.cpp

@@ -2137,7 +2137,7 @@ void ServerGameState::UpdateEntities()
 		else
 		{
 			// workaround: force-migrate a stuck entity
-			if ((time - entity->lastReceivedAt) > 10s)
+			if ((time - entity->lastReceivedAt) > 5s)
 			{
 				if (g_oneSyncForceMigration->GetValue() || fx::IsBigMode())
 				{

code/components/citizen-server-impl/src/state/ServerGameState_Scripting.cpp

@@ -1670,6 +1670,31 @@ static void Init()
 					playerEntity->routingBucket = bucket;
 				}
 
+				if (oldBucket != bucket)
+				{
+					auto slotId = client->GetSlotId();
+					
+					std::shared_lock<std::shared_mutex> lock(gameState->m_entityListMutex);
+					for (auto& entity : gameState->m_entityList)
+					{
+						if (!entity || !entity->syncTree)
+						{
+							continue;
+						}
+
+						if (entity->routingBucket == oldBucket)
+						{
+							std::lock_guard<std::shared_mutex> _(entity->guidMutex);
+							entity->relevantTo.reset(slotId);
+
+							auto owner = entity->GetClient();
+							if (owner && owner == client)
+							{
+								entity->wantsReassign = true;
+							}
+						}
+					}
+				}
 
 				auto eventManager = resourceManager->GetComponent<fx::ResourceEventManagerComponent>();
 				/*NETEV onPlayerBucketChange SERVER