ToxicMushroom/mare.client
1
0
Fork 0
mirror of https://github.com/Caraxi/mare.client.git synced 2025-12-12 18:07:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

actually fix not sending data properly

Browse source
This commit is contained in:
Stanley Dimant 2022-07-26 18:45:46 +02:00
parent 6b9d79b88d
commit 975a813b7f
4 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
MareSynchronos/Factories/CharacterDataFactory.cs
View file

@ -31,7 +31,7 @@ public class CharacterDataFactory
_ipcManager = ipcManager;
}
public CharacterData BuildCharacterData(CharacterData previousData, ObjectKind objectKind, IntPtr playerPointer)
public CharacterData BuildCharacterData(CharacterData previousData, ObjectKind objectKind, IntPtr playerPointer, CancellationToken token)
{
if (!_ipcManager.Initialized)
{
@ -48,7 +48,12 @@ public class CharacterDataFactory
try
{
return CreateCharacterData(previousData, objectKind, playerPointer);
return CreateCharacterData(previousData, objectKind, playerPointer, token);
}
catch (OperationCanceledException)
{
Logger.Debug("Cancelled creating Character data");
return previousData;
}
catch (Exception e)
{
@ -186,7 +191,7 @@ public class CharacterDataFactory
cache.AddFileReplacement(objectKind, texDx11Replacement);
}
private unsafe CharacterData CreateCharacterData(CharacterData previousData, ObjectKind objectKind, IntPtr charaPointer)
private unsafe CharacterData CreateCharacterData(CharacterData previousData, ObjectKind objectKind, IntPtr charaPointer, CancellationToken token)
{
Stopwatch st = Stopwatch.StartNew();
var chara = _dalamudUtil.CreateGameObject(charaPointer)!;
@ -218,6 +223,8 @@ public class CharacterDataFactory
continue;
}
token.ThrowIfCancellationRequested();
AddReplacementsFromRenderModel(mdl, objectKind, previousData, 0);
}