From 01184f543f05ba1d62af46e5d1fcb3e33d2ab2dd Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Fri, 9 Sep 2022 21:22:25 +0200 Subject: [PATCH] revert change generating character data on main thread --- MareSynchronos/Factories/CharacterDataFactory.cs | 4 ++-- MareSynchronos/Managers/PlayerManager.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MareSynchronos/Factories/CharacterDataFactory.cs b/MareSynchronos/Factories/CharacterDataFactory.cs index 8f5a074..8f2e049 100644 --- a/MareSynchronos/Factories/CharacterDataFactory.cs +++ b/MareSynchronos/Factories/CharacterDataFactory.cs @@ -40,7 +40,7 @@ public class CharacterDataFactory return playerPointer == IntPtr.Zero || ((Character*)playerPointer)->GameObject.GetDrawObject() == null; } - public async Task BuildCharacterData(CharacterData previousData, ObjectKind objectKind, IntPtr playerPointer, CancellationToken token) + public CharacterData BuildCharacterData(CharacterData previousData, ObjectKind objectKind, IntPtr playerPointer, CancellationToken token) { if (!_ipcManager.Initialized) { @@ -72,7 +72,7 @@ public class CharacterDataFactory try { - return await _dalamudUtil.RunOnFrameworkThread(() => CreateCharacterData(previousData, objectKind, playerPointer, token)); + return CreateCharacterData(previousData, objectKind, playerPointer, token); } catch (OperationCanceledException) { diff --git a/MareSynchronos/Managers/PlayerManager.cs b/MareSynchronos/Managers/PlayerManager.cs index c14d834..cdca271 100644 --- a/MareSynchronos/Managers/PlayerManager.cs +++ b/MareSynchronos/Managers/PlayerManager.cs @@ -119,7 +119,7 @@ namespace MareSynchronos.Managers foreach (var unprocessedObject in playerRelatedObjects.Where(c => c.HasUnprocessedUpdate).ToList()) { Logger.Verbose("Building Cache for " + unprocessedObject.ObjectKind); - PermanentDataCache = await _characterDataFactory.BuildCharacterData(PermanentDataCache, unprocessedObject.ObjectKind, unprocessedObject.Address, token); + PermanentDataCache = _characterDataFactory.BuildCharacterData(PermanentDataCache, unprocessedObject.ObjectKind, unprocessedObject.Address, token); if (!token.IsCancellationRequested) { unprocessedObject.HasUnprocessedUpdate = false;