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

fix some shit maybe

Browse Source
This commit is contained in:
rootdarkarchon
2023-04-27 01:40:52 +02:00
parent db5df98d80
commit a909319ae3
4 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MareSynchronos/PlayerData/Handlers/GameObjectHandler.cs
View File

@@ -99,7 +99,7 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase
nint curPtr = IntPtr.Zero;
try
{
curPtr = _getAddress.Invoke();
curPtr = CurrentAddress;
if (curPtr == IntPtr.Zero) return true;
@@ -136,7 +136,7 @@ public sealed class GameObjectHandler : DisposableMediatorSubscriberBase
{
if (_haltProcessing) return;
var curPtr = _getAddress.Invoke();
var curPtr = CurrentAddress;
bool drawObjDiff = false;
try
{

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

@@ -530,7 +530,7 @@ public sealed class CachedPlayer : DisposableMediatorSubscriberBase
missingPluginsForData.Add("Honorific");
warning.ShownHonorificWarning = true;
}
if (missingPluginsForData.Any())
{
Mediator.Publish(new NotificationMessage("Missing plugins for " + PlayerName,
@@ -570,7 +570,6 @@ public sealed class CachedPlayer : DisposableMediatorSubscriberBase
CheckForNameAndThrow(tempHandler, name);
Logger.LogDebug("[{applicationId}] Restoring Honorific for {alias}/{name}", applicationId, OnlineUser.User.AliasOrUID, name);
await _ipcManager.HonorificClearTitle(address).ConfigureAwait(false);
}
else if (objectKind == ObjectKind.MinionOrMount)
{
@@ -583,7 +582,7 @@ public sealed class CachedPlayer : DisposableMediatorSubscriberBase
}
else if (objectKind == ObjectKind.Pet)
{
var pet = await _dalamudUtil.GetPet(address);
var pet = await _dalamudUtil.GetPet(address).ConfigureAwait(false);
if (pet != IntPtr.Zero)
{
using GameObjectHandler tempHandler = _gameObjectHandlerFactory(ObjectKind.Pet, () => pet, false);
@@ -592,7 +591,7 @@ public sealed class CachedPlayer : DisposableMediatorSubscriberBase
}
else if (objectKind == ObjectKind.Companion)
{
var companion = await _dalamudUtil.GetCompanion(address);
var companion = await _dalamudUtil.GetCompanion(address).ConfigureAwait(false);
if (companion != IntPtr.Zero)
{
using GameObjectHandler tempHandler = _gameObjectHandlerFactory(ObjectKind.Pet, () => companion, false);