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

idk, probably some crashfixes or so

Browse source
This commit is contained in:
rootdarkarchon 2023-04-30 00:46:02 +02:00
parent 3715ca5ce3
commit bbfd6eb3d3
7 changed files with 34 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -204,8 +204,8 @@ public sealed class CachedPlayer : DisposableMediatorSubscriberBase
{
await _ipcManager.PenumbraRemoveTemporaryCollection(Logger, applicationId, PlayerName!).ConfigureAwait(false);
token.ThrowIfCancellationRequested();
await _ipcManager.PenumbraSetTemporaryMods(Logger, applicationId, PlayerName!,
_charaHandler?.GameObjectLazy?.Value.ObjectTableIndex(), moddedPaths, manipulationData).ConfigureAwait(false);
var objTableIndex = await _dalamudUtil.RunOnFrameworkThread(() => _charaHandler!.GameObjectLazy!.Value.ObjectTableIndex()).ConfigureAwait(false);
await _ipcManager.PenumbraSetTemporaryMods(Logger, applicationId, PlayerName!, objTableIndex, moddedPaths, manipulationData).ConfigureAwait(false);
token.ThrowIfCancellationRequested();
}
@ -485,7 +485,7 @@ public sealed class CachedPlayer : DisposableMediatorSubscriberBase
if (string.IsNullOrEmpty(PlayerName))
{
var pc = _dalamudUtil.FindPlayerByNameHash(OnlineUser.Ident);
if (pc == null) return;
if (pc == default((string, nint))) return;
Logger.LogDebug("One-Time Initializing {this}", this);
Initialize(pc.Name.ToString());
Logger.LogDebug("One-Time Initialized {this}", this);

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

@ -92,6 +92,8 @@ public class Pair
{
try
{
if (CachedPlayer != null) return;
_creationSemaphore.Wait();
if (dto == null && _onlineUserIdentDto == null)