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

I hate merges

Browse source
This commit is contained in:
rootdarkarchon 2023-02-19 23:37:25 +01:00
parent d99a6f8294
commit 62d4347196
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
MareSynchronos/Factories/CharacterDataFactory.cs
View file

@ -151,9 +151,12 @@ public class CharacterDataFactory : MediatorSubscriberBase
Task<string> getPalettePlusData = new(() => _ipcManager.PalettePlusBuildPalette());
_processingQueue.Enqueue(getPalettePlusData);
Task.WaitAll(new[] { getGlamourerData, getCustomizeData, getPalettePlusData }, token);
previousData.GlamourerString[playerRelatedObject.ObjectKind] = getGlamourerData.Result;
previousData.CustomizePlusScale = getCustomizeData.Result;
previousData.PalettePlusPalette = getPalettePlusData.Result;
previousData.GlamourerString[playerRelatedObject.ObjectKind] = await getGlamourerData.ConfigureAwait(true);
previousData.CustomizePlusScale = await getCustomizeData.ConfigureAwait(true);
previousData.PalettePlusPalette = await getPalettePlusData.ConfigureAwait(true);
_logger.LogDebug("Glamourer is now: {data}", previousData.GlamourerString[playerRelatedObject.ObjectKind]);
_logger.LogDebug("Customize is now: {data}", previousData.CustomizePlusScale);
_logger.LogDebug("Palette is now: {data}", previousData.PalettePlusPalette);
// gather static replacements from render model
var (forwardResolve, reverseResolve) = BuildDataFromModel(objectKind, charaPointer, token);