t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert change generating character data on main thread

Browse Source
This commit is contained in:
Stanley Dimant
2022-09-09 21:22:25 +02:00
parent f785288971
commit 01184f543f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MareSynchronos/Factories/CharacterDataFactory.cs
View File

@@ -40,7 +40,7 @@ public class CharacterDataFactory
return playerPointer == IntPtr.Zero || ((Character*)playerPointer)->GameObject.GetDrawObject() == null; return playerPointer == IntPtr.Zero || ((Character*)playerPointer)->GameObject.GetDrawObject() == null;
} }
public async Task<CharacterData> BuildCharacterData(CharacterData previousData, ObjectKind objectKind, IntPtr playerPointer, CancellationToken token) public CharacterData BuildCharacterData(CharacterData previousData, ObjectKind objectKind, IntPtr playerPointer, CancellationToken token)
{ {
if (!_ipcManager.Initialized) if (!_ipcManager.Initialized)
{ {
@@ -72,7 +72,7 @@ public class CharacterDataFactory
try try
{ {
return await _dalamudUtil.RunOnFrameworkThread(() => CreateCharacterData(previousData, objectKind, playerPointer, token)); return CreateCharacterData(previousData, objectKind, playerPointer, token);
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {

2
MareSynchronos/Managers/PlayerManager.cs
View File

@@ -119,7 +119,7 @@ namespace MareSynchronos.Managers
foreach (var unprocessedObject in playerRelatedObjects.Where(c => c.HasUnprocessedUpdate).ToList()) foreach (var unprocessedObject in playerRelatedObjects.Where(c => c.HasUnprocessedUpdate).ToList())
{ {
Logger.Verbose("Building Cache for " + unprocessedObject.ObjectKind); 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) if (!token.IsCancellationRequested)
{ {
unprocessedObject.HasUnprocessedUpdate = false; unprocessedObject.HasUnprocessedUpdate = false;