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

fix crashing and such

Browse source
This commit is contained in:
rootdarkarchon 2023-02-27 12:05:53 +01:00
parent 912d0bd800
commit a37281b719
4 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

16
MareSynchronos/Factories/CharacterDataFactory.cs
View file

@ -145,18 +145,14 @@ public class CharacterDataFactory : MediatorSubscriberBase
// gather up data from ipc
previousData.ManipulationString = _ipcManager.PenumbraGetMetaManipulations();
previousData.HeelsOffset = _ipcManager.GetHeelsOffset();
Task<string> getGlamourerData = new(() => _ipcManager.GlamourerGetCharacterCustomization(playerRelatedObject.Address));
_processingQueue.Enqueue(getGlamourerData);
Task<string> getCustomizeData = new(() => _ipcManager.GetCustomizePlusScale());
_processingQueue.Enqueue(getCustomizeData);
Task<string> getPalettePlusData = new(() => _ipcManager.PalettePlusBuildPalette());
_processingQueue.Enqueue(getPalettePlusData);
Task.WaitAll(new[] { getGlamourerData, getCustomizeData, getPalettePlusData }, token);
previousData.GlamourerString[playerRelatedObject.ObjectKind] = await getGlamourerData.ConfigureAwait(true);
previousData.CustomizePlusScale = await getCustomizeData.ConfigureAwait(true);
previousData.PalettePlusPalette = await getPalettePlusData.ConfigureAwait(true);
Task<string> getGlamourerData = Task.Run(() => _ipcManager.GlamourerGetCharacterCustomization(playerRelatedObject.Address));
Task<string> getCustomizeData = Task.Run(() => _ipcManager.GetCustomizePlusScale());
Task<string> getPalettePlusData = Task.Run(() => _ipcManager.PalettePlusBuildPalette());
previousData.GlamourerString[playerRelatedObject.ObjectKind] = await getGlamourerData.ConfigureAwait(false);
_logger.LogDebug("Glamourer is now: {data}", previousData.GlamourerString[playerRelatedObject.ObjectKind]);
previousData.CustomizePlusScale = await getCustomizeData.ConfigureAwait(false);
_logger.LogDebug("Customize is now: {data}", previousData.CustomizePlusScale);
previousData.PalettePlusPalette = await getPalettePlusData.ConfigureAwait(false);
_logger.LogDebug("Palette is now: {data}", previousData.PalettePlusPalette);
// gather static replacements from render model