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

fix gpose hanging

Browse source
This commit is contained in:
Stanley Dimant 2025-01-13 23:43:51 +01:00
parent cacb136161
commit 163048ac49
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
MareSynchronos/Services/CharaData/CharaDataCharacterHandler.cs
View file

@ -71,7 +71,8 @@ public sealed class CharaDataCharacterHandler : DisposableMediatorSubscriberBase
using var handler = await _gameObjectHandlerFactory.Create(ObjectKind.Player, using var handler = await _gameObjectHandlerFactory.Create(ObjectKind.Player,
() => _dalamudUtilService.GetGposeCharacterFromObjectTableByName(name, _dalamudUtilService.IsInGpose)?.Address ?? IntPtr.Zero, false) () => _dalamudUtilService.GetGposeCharacterFromObjectTableByName(name, _dalamudUtilService.IsInGpose)?.Address ?? IntPtr.Zero, false)
.ConfigureAwait(false); .ConfigureAwait(false);
await _ipcManager.Penumbra.RedrawAsync(Logger, handler, applicationId, CancellationToken.None).ConfigureAwait(false); if (handler.Address != nint.Zero)
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, bool reapplyPose = true)

2
MareSynchronos/Services/CharaData/CharaDataNearbyManager.cs
View file

@ -251,7 +251,7 @@ public sealed class CharaDataNearbyManager : DisposableMediatorSubscriberBase
Vector3 cameraPos = new(camera->Position.X, camera->Position.Y, camera->Position.Z); Vector3 cameraPos = new(camera->Position.X, camera->Position.Y, camera->Position.Z);
Vector3 lookAt = new(camera->LookAtVector.X, camera->LookAtVector.Y, camera->LookAtVector.Z); Vector3 lookAt = new(camera->LookAtVector.X, camera->LookAtVector.Y, camera->LookAtVector.Z);
if (_filterEntriesRunningTask?.IsCompleted ?? true) if (_filterEntriesRunningTask?.IsCompleted ?? true && _dalamudUtilService.IsLoggedIn)
_filterEntriesRunningTask = FilterEntriesAsync(cameraPos, lookAt); _filterEntriesRunningTask = FilterEntriesAsync(cameraPos, lookAt);
} }