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

fix edit transfer window, more crashfix, add version nag on connect

Browse source
This commit is contained in:
rootdarkarchon 2023-05-01 20:03:50 +02:00
parent 640adc124e
commit 2b777f94f1
6 changed files with 34 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

24
MareSynchronos/PlayerData/Handlers/GameObjectHandler.cs
View file

@ -105,25 +105,17 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase
{
return await _dalamudUtil.RunOnFrameworkThread(() =>
{
nint curPtr = IntPtr.Zero;
try
var curPtr = _getAddress.Invoke();
if (curPtr == IntPtr.Zero)
{
curPtr = CurrentAddress().GetAwaiter().GetResult();
if (curPtr == IntPtr.Zero) return true;
var drawObj = GetDrawObj(curPtr);
return IsBeingDrawn(drawObj, curPtr);
}
catch (Exception)
{
if (curPtr != IntPtr.Zero)
{
return true;
}
Address = IntPtr.Zero;
DrawObjectAddress = IntPtr.Zero;
return false;
}
var drawObj = GetDrawObj(curPtr);
return IsBeingDrawn(drawObj, curPtr);
}).ConfigureAwait(false);
}

4
MareSynchronos/PlayerData/Pairs/CachedPlayer.cs
View file

@ -195,6 +195,10 @@ public sealed class CachedPlayer : DisposableMediatorSubscriberBase
{
throw new InvalidOperationException("Player name not equal to requested name, pointer invalid");
}
if (handler.Address == IntPtr.Zero)
{
throw new InvalidOperationException("Player pointer is zero, pointer invalid");
}
}
private async Task ApplyBaseData(Guid applicationId, Dictionary<string, string> moddedPaths, string manipulationData, CancellationToken token)