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

some customize+ application fixes

Browse Source
This commit is contained in:
rootdarkarchon
2023-07-19 09:48:29 +02:00
parent 04961618ed
commit 71c510b0f4
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MareSynchronos/PlayerData/Factories/PlayerDataFactory.cs
View File

@@ -79,6 +79,7 @@ public class PlayerDataFactory
var previousFileReplacements = previousData.FileReplacements.ToDictionary(d => d.Key, d => d.Value);
var previousGlamourerData = previousData.GlamourerString.ToDictionary(d => d.Key, d => d.Value);
var previousCustomize = previousData.CustomizePlusScale.ToDictionary(d => d.Key, d => d.Value);
try
{
@@ -100,6 +101,7 @@ public class PlayerDataFactory
previousData.FileReplacements = previousFileReplacements;
previousData.GlamourerString = previousGlamourerData;
previousData.CustomizePlusScale = previousCustomize;
}
private unsafe void AddPlayerSpecificReplacements(Human* human, HashSet<string> forwardResolve, HashSet<string> reverseResolve)
@@ -312,6 +314,11 @@ public class PlayerDataFactory
previousData.FileReplacements[objectKind].Clear();
}
if (previousData.CustomizePlusScale.ContainsKey(objectKind))
{
previousData.CustomizePlusScale.Remove(objectKind);
}
// wait until chara is not drawing and present so nothing spontaneously explodes
await _dalamudUtil.WaitWhileCharacterIsDrawing(_logger, playerRelatedObject, Guid.NewGuid(), 30000, ct: token).ConfigureAwait(false);
int totalWaitTime = 10000;
@@ -381,7 +388,7 @@ public class PlayerDataFactory
previousData.GlamourerString[playerRelatedObject.ObjectKind] = await getGlamourerData.ConfigureAwait(false);
_logger.LogDebug("Glamourer is now: {data}", previousData.GlamourerString[playerRelatedObject.ObjectKind]);
var customizeScale = await getCustomizeData.ConfigureAwait(false);
if (customizeScale != null)
if (!string.IsNullOrEmpty(customizeScale))
{
previousData.CustomizePlusScale[playerRelatedObject.ObjectKind] = customizeScale;
_logger.LogDebug("Customize is now: {data}", previousData.CustomizePlusScale[playerRelatedObject.ObjectKind]);