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

fix crash on logout, change several logger.debug to verbose, adjustments to player cache generation, fixes to file scan manager, better handling disconnects, some refactoring, adjustments to intro UI, correct display of server state

Browse source
This commit is contained in:
Stanley Dimant 2022-07-04 01:52:08 +02:00
parent 7a58321ea0
commit db4d5f37f9
21 changed files with 283 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

8
MareSynchronos/Managers/CachedPlayer.cs
View file

@ -178,12 +178,13 @@ public class CachedPlayer
public void DisposePlayer()
{
Logger.Debug("Disposing " + PlayerName + " (" + PlayerNameHash + ")");
if (_isDisposed) return;
if (string.IsNullOrEmpty(PlayerName)) return;
Logger.Verbose("Disposing " + PlayerName + " (" + PlayerNameHash + ")");
_isDisposed = true;
try
{
Logger.Debug("Restoring state for " + PlayerName);
Logger.Verbose("Restoring state for " + PlayerName);
_dalamudUtil.FrameworkUpdate -= DalamudUtilOnFrameworkUpdate;
_ipcManager.PenumbraRedrawEvent -= IpcManagerOnPenumbraRedrawEvent;
_apiController.CharacterReceived -= ApiControllerOnCharacterReceived;
@ -191,7 +192,7 @@ public class CachedPlayer
_downloadCancellationTokenSource?.Dispose();
_downloadCancellationTokenSource = null;
_ipcManager.PenumbraRemoveTemporaryCollection(PlayerName);
if (PlayerCharacter != null)
if (PlayerCharacter != null && PlayerCharacter.IsValid())
{
_ipcManager.GlamourerApplyOnlyCustomization(_originalGlamourerData, PlayerCharacter);
_ipcManager.GlamourerApplyOnlyEquipment(_lastGlamourerData, PlayerCharacter);
@ -206,7 +207,6 @@ public class CachedPlayer
PlayerName = string.Empty;
PlayerCharacter = null;
IsVisible = false;
_isDisposed = true;
}
}