ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-13 12:14:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix bad merge

Browse source
This commit is contained in:
goaaats 2025-11-18 00:52:30 +01:00
parent b7dda599fb
commit cc91916574
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dalamud/Game/ClientState/Buddy/BuddyList.cs
View file

@ -9,8 +9,6 @@ using Dalamud.Plugin.Services;
using CSBuddy = FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy; using CSBuddy = FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy;
using CSUIState = FFXIVClientStructs.FFXIV.Client.Game.UI.UIState; using CSUIState = FFXIVClientStructs.FFXIV.Client.Game.UI.UIState;
using CSBuddy = FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy;
using CSBuddyMember = FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy.BuddyMember; using CSBuddyMember = FFXIVClientStructs.FFXIV.Client.Game.UI.Buddy.BuddyMember;
namespace Dalamud.Game.ClientState.Buddy; namespace Dalamud.Game.ClientState.Buddy;
@ -74,7 +72,7 @@ internal sealed partial class BuddyList : IServiceType, IBuddyList
} }
} }
private unsafe CSBuddy* BuddyListStruct => &UIState.Instance()->Buddy; private unsafe CSBuddy* BuddyListStruct => &CSUIState.Instance()->Buddy;
/// <inheritdoc/> /// <inheritdoc/>
public IBuddyMember? this[int index] public IBuddyMember? this[int index]
@ -113,7 +111,7 @@ internal sealed partial class BuddyList : IServiceType, IBuddyList
if (address == 0) if (address == 0)
return null; return null;
if (this.clientState.LocalContentId == 0) if (this.playerState.ContentId == 0)
return null; return null;
var buddy = new BuddyMember((CSBuddyMember*)address); var buddy = new BuddyMember((CSBuddyMember*)address);

4
Dalamud/Game/ClientState/Party/PartyList.cs
View file

@ -93,7 +93,7 @@ internal sealed unsafe partial class PartyList : IServiceType, IPartyList
/// <inheritdoc/> /// <inheritdoc/>
public IPartyMember? CreatePartyMemberReference(nint address) public IPartyMember? CreatePartyMemberReference(nint address)
{ {
if (this.clientState.LocalContentId == 0) if (this.playerState.ContentId == 0)
return null; return null;
if (address == 0) if (address == 0)
@ -114,7 +114,7 @@ internal sealed unsafe partial class PartyList : IServiceType, IPartyList
/// <inheritdoc/> /// <inheritdoc/>
public IPartyMember? CreateAllianceMemberReference(nint address) public IPartyMember? CreateAllianceMemberReference(nint address)
{ {
if (this.clientState.LocalContentId == 0) if (this.playerState.ContentId == 0)
return null; return null;
if (address == 0) if (address == 0)