From a03e92ccef0ea3fdb6d22586b639026d8d2bef18 Mon Sep 17 00:00:00 2001 From: rootdarkarchon Date: Fri, 3 Feb 2023 19:34:15 +0100 Subject: [PATCH] some minor fixes --- MareSynchronos/Factories/CharacterDataFactory.cs | 2 +- MareSynchronos/Managers/CachedPlayer.cs | 1 + MareSynchronos/Managers/IpcManager.cs | 4 ++-- MareSynchronos/Utils/DalamudUtil.cs | 2 -- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/MareSynchronos/Factories/CharacterDataFactory.cs b/MareSynchronos/Factories/CharacterDataFactory.cs index cf6c11e..b973567 100644 --- a/MareSynchronos/Factories/CharacterDataFactory.cs +++ b/MareSynchronos/Factories/CharacterDataFactory.cs @@ -300,7 +300,7 @@ public class CharacterDataFactory st.Stop(); - Logger.Verbose("Building " + objectKind + " Data took " + st.ElapsedMilliseconds + "ms"); + Logger.Info("Building character data for " + objectKind + " took " + st.ElapsedMilliseconds + "ms"); return previousData; } diff --git a/MareSynchronos/Managers/CachedPlayer.cs b/MareSynchronos/Managers/CachedPlayer.cs index b043159..af51202 100644 --- a/MareSynchronos/Managers/CachedPlayer.cs +++ b/MareSynchronos/Managers/CachedPlayer.cs @@ -228,6 +228,7 @@ public class CachedPlayer : MediatorSubscriberBase, IDisposable Logger.Debug("Disposing " + PlayerName + " (" + OnlineUser + ")"); try { + _currentCharacterEquipment?.Dispose(); Logger.Verbose("Restoring state for " + PlayerName); _ipcManager.PenumbraRemoveTemporaryCollection(PlayerName); _downloadCancellationTokenSource?.Cancel(); diff --git a/MareSynchronos/Managers/IpcManager.cs b/MareSynchronos/Managers/IpcManager.cs index ded2e71..7efa984 100644 --- a/MareSynchronos/Managers/IpcManager.cs +++ b/MareSynchronos/Managers/IpcManager.cs @@ -455,8 +455,8 @@ public class IpcManager : MediatorSubscriberBase, IDisposable { var collName = "Mare_" + characterName; Logger.Verbose("Removing temp collection for " + collName); - var ret = _penumbraRemoveTemporaryMod.Invoke("MaraChara", collName, 0); - Logger.Verbose("RemoveTemporaryMod: " + ret); + var ret = _penumbraRemoveTemporaryMod.Invoke("MareChara", collName, 0); + Logger.Verbose("RemoveTemporaryMod: " + ret); var ret2 = _penumbraRemoveTemporaryCollection.Invoke(collName); Logger.Verbose("RemoveTemporaryCollection: " + ret2); }); diff --git a/MareSynchronos/Utils/DalamudUtil.cs b/MareSynchronos/Utils/DalamudUtil.cs index d0f05f2..fd88602 100644 --- a/MareSynchronos/Utils/DalamudUtil.cs +++ b/MareSynchronos/Utils/DalamudUtil.cs @@ -243,8 +243,6 @@ public class DalamudUtil : IDisposable curWaitTime += tick; Thread.Sleep(tick); } - - return; } public unsafe void DisableDraw(IntPtr characterAddress)