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

fix mcdf application

Browse Source
This commit is contained in:
rootdarkarchon
2023-10-09 18:58:17 +02:00
parent dc3c6c199d
commit afe6c75688
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MareSynchronos/Interop/IpcManager.cs
View File

@@ -300,7 +300,7 @@ public sealed class IpcManager : DisposableMediatorSubscriberBase
logger.LogDebug("[{appid}] Calling On IPC: GlamourerRevertByName", applicationId); logger.LogDebug("[{appid}] Calling On IPC: GlamourerRevertByName", applicationId);
_glamourerRevertByName.InvokeAction(name, LockCode); _glamourerRevertByName.InvokeAction(name, LockCode);
logger.LogDebug("[{appid}] Calling On IPC: GlamourerUnlockName", applicationId); logger.LogDebug("[{appid}] Calling On IPC: GlamourerUnlockName", applicationId);
_glamourerUnlock.InvokeAction(name, LockCode); _glamourerUnlock.InvokeFunc(name, LockCode);
} }
catch (Exception ex) catch (Exception ex)
{ {

1
MareSynchronos/PlayerData/Export/MareCharaFileManager.cs
View File

@@ -105,6 +105,7 @@ public class MareCharaFileManager : DisposableMediatorSubscriberBase
_gposeGameObjects[charaTarget.Name.ToString()] = tempHandler; _gposeGameObjects[charaTarget.Name.ToString()] = tempHandler;
await _ipcManager.GlamourerApplyAllAsync(_logger, tempHandler, LoadedCharaFile.CharaFileData.GlamourerData, applicationId, disposeCts.Token).ConfigureAwait(false); await _ipcManager.GlamourerApplyAllAsync(_logger, tempHandler, LoadedCharaFile.CharaFileData.GlamourerData, applicationId, disposeCts.Token).ConfigureAwait(false);
await _ipcManager.PenumbraRedrawAsync(_logger, tempHandler, applicationId, disposeCts.Token).ConfigureAwait(false);
_dalamudUtil.WaitWhileGposeCharacterIsDrawing(charaTarget.Address, 30000); _dalamudUtil.WaitWhileGposeCharacterIsDrawing(charaTarget.Address, 30000);
await _ipcManager.PenumbraRemoveTemporaryCollectionAsync(_logger, applicationId, coll).ConfigureAwait(false); await _ipcManager.PenumbraRemoveTemporaryCollectionAsync(_logger, applicationId, coll).ConfigureAwait(false);
if (!string.IsNullOrEmpty(LoadedCharaFile.CharaFileData.CustomizePlusData)) if (!string.IsNullOrEmpty(LoadedCharaFile.CharaFileData.CustomizePlusData))

9
MareSynchronos/PlayerData/Handlers/GameObjectHandler.cs
View File

@@ -422,7 +422,14 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase
_clearCts?.Cancel(); _clearCts?.Cancel();
_clearCts?.Dispose(); _clearCts?.Dispose();
_clearCts = null; _clearCts = null;
_zoningCts.CancelAfter(2500); try
{
_zoningCts?.CancelAfter(2500);
}
catch (Exception ex)
{
Logger.LogWarning(ex, "Zoning CTS cancel issue");
}
} }
private void ZoneSwitchStart() private void ZoneSwitchStart()

2
MareSynchronos/PlayerData/Pairs/Pair.cs
View File

@@ -81,7 +81,7 @@ public class Pair
if (CachedPlayer == null) if (CachedPlayer == null)
{ {
_logger.LogDebug("Received Data for {uid} but CachedPlayer does not exist, waiting", data.User.UID); _logger.LogDebug("Received Data for {uid} but CachedPlayer does not exist, waiting", data.User.UID);
Task.Run(async () => _ = Task.Run(async () =>
{ {
using var timeoutCts = new CancellationTokenSource(); using var timeoutCts = new CancellationTokenSource();
timeoutCts.CancelAfter(TimeSpan.FromSeconds(120)); timeoutCts.CancelAfter(TimeSpan.FromSeconds(120));