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

minor fixes

Browse Source
This commit is contained in:
Stanley Dimant
2022-09-18 18:09:39 +02:00
parent 6149d7eb73
commit 25e87e6ec2
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MareSynchronos/Managers/CachedPlayer.cs
View File

@@ -406,10 +406,11 @@ public class CachedPlayer
public void InitializePlayer(IntPtr character, string name, CharacterCacheDto? cache) public void InitializePlayer(IntPtr character, string name, CharacterCacheDto? cache)
{ {
if (!_isDisposed) return; if (!_isDisposed) return;
Logger.Debug("Initializing Player " + this + " has cache: " + (cache != null));
IsVisible = true; IsVisible = true;
PlayerName = name; PlayerName = name;
PlayerCharacter = character; PlayerCharacter = character;
Logger.Debug("Initializing Player " + this + " has cache: " + (cache != null));
_dalamudUtil.DelayedFrameworkUpdate += DalamudUtilOnDelayedFrameworkUpdate; _dalamudUtil.DelayedFrameworkUpdate += DalamudUtilOnDelayedFrameworkUpdate;
_ipcManager.PenumbraRedrawEvent += IpcManagerOnPenumbraRedrawEvent; _ipcManager.PenumbraRedrawEvent += IpcManagerOnPenumbraRedrawEvent;
_originalGlamourerData = _ipcManager.GlamourerGetCharacterCustomization(PlayerCharacter); _originalGlamourerData = _ipcManager.GlamourerGetCharacterCustomization(PlayerCharacter);

5
MareSynchronos/Managers/OnlinePlayerManager.cs
View File

@@ -23,7 +23,6 @@ public class OnlinePlayerManager : IDisposable
private List<string> OnlineVisiblePlayerHashes => _onlineCachedPlayers.Select(p => p.Value).Where(p => p.PlayerCharacter != IntPtr.Zero) private List<string> OnlineVisiblePlayerHashes => _onlineCachedPlayers.Select(p => p.Value).Where(p => p.PlayerCharacter != IntPtr.Zero)
.Select(p => p.PlayerNameHash).ToList(); .Select(p => p.PlayerNameHash).ToList();
private DateTime _lastPlayerObjectCheck = DateTime.Now;
public OnlinePlayerManager(ApiController apiController, DalamudUtil dalamudUtil, IpcManager ipcManager, PlayerManager playerManager) public OnlinePlayerManager(ApiController apiController, DalamudUtil dalamudUtil, IpcManager ipcManager, PlayerManager playerManager)
{ {
@@ -209,8 +208,6 @@ public class OnlinePlayerManager : IDisposable
{ {
if (!_dalamudUtil.IsPlayerPresent || !_ipcManager.Initialized || !_apiController.IsConnected) return; if (!_dalamudUtil.IsPlayerPresent || !_ipcManager.Initialized || !_apiController.IsConnected) return;
if (DateTime.Now < _lastPlayerObjectCheck.AddSeconds(0.25)) return;
var playerCharacters = _dalamudUtil.GetPlayerCharacters(); var playerCharacters = _dalamudUtil.GetPlayerCharacters();
foreach (var pChar in playerCharacters) foreach (var pChar in playerCharacters)
{ {
@@ -236,8 +233,6 @@ public class OnlinePlayerManager : IDisposable
Logger.Verbose("Has new visible players, pushing character data"); Logger.Verbose("Has new visible players, pushing character data");
PushCharacterData(newlyVisiblePlayers); PushCharacterData(newlyVisiblePlayers);
} }
_lastPlayerObjectCheck = DateTime.Now;
} }
private void PushCharacterData(List<string> visiblePlayers) private void PushCharacterData(List<string> visiblePlayers)

2
MareSynchronos/UI/UIShared.cs
View File

@@ -454,7 +454,7 @@ namespace MareSynchronos.UI
{ {
ColorTextWrapped("Do not point the cache path directly to the Penumbra directory. If necessary, make a subfolder in it.", ImGuiColors.DalamudRed); ColorTextWrapped("Do not point the cache path directly to the Penumbra directory. If necessary, make a subfolder in it.", ImGuiColors.DalamudRed);
} }
else if (!Directory.Exists(cacheDirectory) || !_isDirectoryWritable) else if (!_isDirectoryWritable)
{ {
ColorTextWrapped("The folder you selected does not exist or cannot be written to. Please provide a valid path.", ImGuiColors.DalamudRed); ColorTextWrapped("The folder you selected does not exist or cannot be written to. Please provide a valid path.", ImGuiColors.DalamudRed);
} }