Add forced respawn char handover after 5 seconds

Add debug logging why deferred results might not always work (needs loglevel verbose)
Add debug logging for respawn system nullptr investigation (needs loglevel verbose)

Author: Arkensor

src/Scripts/Game/EPF_DeferredApplyResult.c

@@ -21,6 +21,8 @@ class EPF_DeferredApplyResult
 	//------------------------------------------------------------------------------------------------
 	static void AddPending(notnull EPF_EntitySaveData saveData, string awaitIdentifier)
 	{
+		Print(string.Format("EPF_DeferredApplyResult.AddPending(%1, %2)", saveData, awaitIdentifier), LogLevel.VERBOSE);
+
 		EPF_PendingIdentifierHolder data = s_mPendingIdentifiers.Get(saveData);
 		if (!data)
 		{
@@ -35,6 +37,8 @@ class EPF_DeferredApplyResult
 	//------------------------------------------------------------------------------------------------
 	static void AddPending(notnull EPF_ComponentSaveData componentSaveData, string awaitIdentifier)
 	{
+		Print(string.Format("EPF_DeferredApplyResult.AddPending(%1, %2)", componentSaveData, awaitIdentifier), LogLevel.VERBOSE);
+
 		EPF_PendingComponentIdentifierHolder data = s_mPendingComponentIdentifiers.Get(componentSaveData);
 		if (!data)
 		{
@@ -49,6 +53,8 @@ class EPF_DeferredApplyResult
 	//------------------------------------------------------------------------------------------------
 	static void SetFinished(notnull EPF_EntitySaveData saveData, string awaitIdentifier)
 	{
+		Print(string.Format("EPF_DeferredApplyResult.SetFinished(%1, %2)", saveData, awaitIdentifier), LogLevel.VERBOSE);
+
 		EPF_PendingIdentifierHolder data = s_mPendingIdentifiers.Get(saveData);
 		if (!data)
 			return;
@@ -62,6 +68,8 @@ class EPF_DeferredApplyResult
 	//------------------------------------------------------------------------------------------------
 	static void SetFinished(notnull EPF_ComponentSaveData componentSaveData, string awaitIdentifier)
 	{
+		Print(string.Format("EPF_DeferredApplyResult.SetFinished(%1, %2)", componentSaveData, awaitIdentifier), LogLevel.VERBOSE);
+
 		EPF_PendingComponentIdentifierHolder data = s_mPendingComponentIdentifiers.Get(componentSaveData);
 		if (!data)
 			return;

src/Scripts/Game/RespawnSystem/EPF_RespawnHandlerComponent.c

@@ -135,8 +135,17 @@ class EPF_RespawnHandlerComponent : SCR_RespawnHandlerComponent
 		iterCopy.Copy(m_sEnqueuedPlayers);
 		foreach (int playerId : iterCopy)
 		{
-			if (m_pRespawnSystem.IsReadyForSpawn(playerId))
-				m_pPlayerManager.GetPlayerController(playerId).RequestRespawn();
+			if (!m_pRespawnSystem.IsReadyForSpawn(playerId))
+				continue;
+
+			PlayerController playerController = m_pPlayerManager.GetPlayerController(playerId);
+			if (!playerController)
+			{
+				Print("Failed to get player controller for playerId: " + playerId, LogLevel.VERBOSE);
+				continue;
+			}
+
+			playerController.RequestRespawn();
 		}
 	}
 

src/Scripts/Game/RespawnSystem/EPF_RespawnSytemComponent.c

@@ -32,6 +32,10 @@ class EPF_RespawnSytemComponent : SCR_RespawnSystemComponent
 				m_mLoadingCharacters.Set(playerEntity, playerId);
 
 				persistenceComponent.GetOnAfterLoadEvent().Insert(OnCharacterLoaded);
+
+				// TODO: Remove hard loading time limit when we know all spawn block bugs are fixed.
+				GetGame().GetCallqueue().CallLater(OnCharacterLoaded, 5000, false, persistenceComponent, saveData);
+
 				if (persistenceComponent.Load(saveData))
 					return;
 
@@ -79,13 +83,19 @@ class EPF_RespawnSytemComponent : SCR_RespawnSystemComponent
 	//------------------------------------------------------------------------------------------------
 	protected void OnCharacterLoaded(EPF_PersistenceComponent persistenceComponent, EPF_EntitySaveData saveData)
 	{
-		// We only want to know this once
-		persistenceComponent.GetOnAfterLoadEvent().Remove(OnCharacterLoaded);
+		if (!persistenceComponent || !saveData)
+			return;
 
 		GenericEntity playerEntity = GenericEntity.Cast(persistenceComponent.GetOwner());
-		int playerId = m_mLoadingCharacters.Get(playerEntity);
+		int playerId;
+		if (!m_mLoadingCharacters.Find(playerEntity, playerId))
+			return; // Already processed before the hard loading limit callqueue invoke
+
 		m_mLoadingCharacters.Remove(playerEntity);
 
+		// We only want to know this once
+		persistenceComponent.GetOnAfterLoadEvent().Remove(OnCharacterLoaded);
+
 		EPF_PersistenceManager persistenceManager = EPF_PersistenceManager.GetInstance();
 		SCR_CharacterInventoryStorageComponent inventoryStorage = EPF_Component<SCR_CharacterInventoryStorageComponent>.Find(playerEntity);
 		if (inventoryStorage)