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

test version for .net6/dalamudapi7

Browse Source
This commit is contained in:
Stanley Dimant
2022-08-24 01:40:21 +02:00
parent 61d6458707
commit 0d3fbc245b
6 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MareSynchronos/Managers/CachedPlayer.cs
View File

@@ -9,9 +9,9 @@ using FFXIVClientStructs.FFXIV.Client.Game.Character;
using MareSynchronos.API;
using MareSynchronos.FileCacheDB;
using MareSynchronos.Interop;
using MareSynchronos.Models;
using MareSynchronos.Utils;
using MareSynchronos.WebAPI;
using Penumbra.GameData.Structs;
namespace MareSynchronos.Managers;
@@ -59,7 +59,7 @@ public class CachedPlayer
private CharacterCacheDto _cachedData = new();
private CharacterEquipment? _currentCharacterEquipment;
private PlayerRelatedObject? _currentCharacterEquipment;
public void ApplyCharacterData(CharacterCacheDto characterData)
{
@@ -363,7 +363,8 @@ public class CachedPlayer
_dalamudUtil.FrameworkUpdate += DalamudUtilOnFrameworkUpdate;
_ipcManager.PenumbraRedrawEvent += IpcManagerOnPenumbraRedrawEvent;
_originalGlamourerData = _ipcManager.GlamourerGetCharacterCustomization(PlayerCharacter);
_currentCharacterEquipment = new CharacterEquipment(PlayerCharacter);
_currentCharacterEquipment = new PlayerRelatedObject(ObjectKind.Player, IntPtr.Zero, IntPtr.Zero,
() => _dalamudUtil.GetPlayerCharacterFromObjectTableByName(PlayerName)?.Address ?? IntPtr.Zero);
_isDisposed = false;
if (cache != null)
{
@@ -382,7 +383,8 @@ public class CachedPlayer
return;
}
if (!_currentCharacterEquipment!.CompareAndUpdate(PlayerCharacter))
_currentCharacterEquipment?.CheckAndUpdateObject();
if (_currentCharacterEquipment?.HasUnprocessedUpdate ?? false)
{
OnPlayerChanged();
}

1
MareSynchronos/Managers/PlayerManager.cs
View File

@@ -29,7 +29,6 @@ namespace MareSynchronos.Managers
private CancellationTokenSource? _playerChangedCts = new();
private DateTime _lastPlayerObjectCheck;
private CharacterEquipment? _currentCharacterEquipment = new();
private List<PlayerRelatedObject> playerRelatedObjects = new List<PlayerRelatedObject>();