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

GPose Together fixes

Browse Source 
safeguard pose/world data generation loops

safeguard more

fix gpose together charas getting their collection nuked going outside gpose
This commit is contained in:
Stanley Dimant
2025-01-20 10:29:51 +01:00
committed by Loporrit
parent 93aff198f2
commit 833fbd0e25
3 changed files with 131 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
MareSynchronos/Services/CharaData/CharaDataCharacterHandler.cs
View File

@@ -29,7 +29,7 @@ public sealed class CharaDataCharacterHandler : DisposableMediatorSubscriberBase
{
foreach (var chara in _handledCharaData)
{
_ = RevertHandledChara(chara, reapplyPose: false);
_ = RevertHandledChara(chara);
}
});
@@ -56,11 +56,11 @@ public sealed class CharaDataCharacterHandler : DisposableMediatorSubscriberBase
base.Dispose(disposing);
foreach (var chara in _handledCharaData)
{
_ = RevertHandledChara(chara, reapplyPose: false);
_ = RevertHandledChara(chara);
}
}
public async Task RevertChara(string name, Guid? cPlusId, bool reapplyPose = true)
public async Task RevertChara(string name, Guid? cPlusId)
{
Guid applicationId = Guid.NewGuid();
await _ipcManager.Glamourer.RevertByNameAsync(Logger, name, applicationId).ConfigureAwait(false);
@@ -75,20 +75,20 @@ public sealed class CharaDataCharacterHandler : DisposableMediatorSubscriberBase
await _ipcManager.Penumbra.RedrawAsync(Logger, handler, applicationId, CancellationToken.None).ConfigureAwait(false);
}
public async Task<bool> RevertHandledChara(string name, bool reapplyPose = true)
public async Task<bool> RevertHandledChara(string name)
{
var handled = _handledCharaData.FirstOrDefault(f => string.Equals(f.Name, name, StringComparison.Ordinal));
if (handled == null) return false;
_handledCharaData.Remove(handled);
await _dalamudUtilService.RunOnFrameworkThread(() => RevertChara(handled.Name, handled.CustomizePlus, reapplyPose)).ConfigureAwait(false);
await _dalamudUtilService.RunOnFrameworkThread(() => RevertChara(handled.Name, handled.CustomizePlus)).ConfigureAwait(false);
return true;
}
public Task RevertHandledChara(HandledCharaDataEntry? handled, bool reapplyPose = true)
public Task RevertHandledChara(HandledCharaDataEntry? handled)
{
if (handled == null) return Task.CompletedTask;
_handledCharaData.Remove(handled);
return _dalamudUtilService.RunOnFrameworkThread(() => RevertChara(handled.Name, handled.CustomizePlus, reapplyPose));
return _dalamudUtilService.RunOnFrameworkThread(() => RevertChara(handled.Name, handled.CustomizePlus));
}
internal void AddHandledChara(HandledCharaDataEntry handledCharaDataEntry)