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

do not apply data during cutscene/gpose

Browse Source
This commit is contained in:
Stanley Dimant
2023-03-27 11:06:32 +02:00
parent 6b35b2bf4a
commit d5be2aecfa
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MareSynchronos/PlayerData/Pairs/CachedPlayer.cs
View File

@@ -81,6 +81,12 @@ public sealed class CachedPlayer : DisposableMediatorSubscriberBase
if (string.Equals(characterData.DataHash.Value, _cachedData.DataHash.Value, StringComparison.Ordinal) && !forced) return; if (string.Equals(characterData.DataHash.Value, _cachedData.DataHash.Value, StringComparison.Ordinal) && !forced) return;
if (_dalamudUtil.IsInCutscene || _dalamudUtil.IsInGpose)
{
Logger.LogInformation("Received data for {player} while in cutscene/gpose, returning", this);
return;
}
var charaDataToUpdate = CheckUpdatedData(_cachedData.DeepClone(), characterData, forced); var charaDataToUpdate = CheckUpdatedData(_cachedData.DeepClone(), characterData, forced);
if (charaDataToUpdate.TryGetValue(ObjectKind.Player, out var playerChanges)) if (charaDataToUpdate.TryGetValue(ObjectKind.Player, out var playerChanges))
@@ -375,11 +381,12 @@ public sealed class CachedPlayer : DisposableMediatorSubscriberBase
if (!updatedData.Any()) if (!updatedData.Any())
{ {
Logger.LogDebug("Nothing to update for {obj}", this); Logger.LogDebug("Nothing to update for {obj}", this);
return;
} }
var updateModdedPaths = updatedData.Values.Any(v => v.Any(p => p == PlayerChanges.Mods)); var updateModdedPaths = updatedData.Values.Any(v => v.Any(p => p == PlayerChanges.Mods));
_downloadCancellationTokenSource = _downloadCancellationTokenSource?.CancelRecreate(); _downloadCancellationTokenSource = _downloadCancellationTokenSource?.CancelRecreate() ?? new CancellationTokenSource();
var downloadToken = _downloadCancellationTokenSource.Token; var downloadToken = _downloadCancellationTokenSource.Token;
Task.Run(async () => Task.Run(async () =>
@@ -429,7 +436,7 @@ public sealed class CachedPlayer : DisposableMediatorSubscriberBase
if (downloadToken.IsCancellationRequested || (appToken?.IsCancellationRequested ?? false)) return; if (downloadToken.IsCancellationRequested || (appToken?.IsCancellationRequested ?? false)) return;
_applicationCancellationTokenSource = _applicationCancellationTokenSource.CancelRecreate(); _applicationCancellationTokenSource = _applicationCancellationTokenSource.CancelRecreate() ?? new CancellationTokenSource();
var token = _applicationCancellationTokenSource.Token; var token = _applicationCancellationTokenSource.Token;
_applicationTask = Task.Run(async () => _applicationTask = Task.Run(async () =>
{ {