From 5471fb3fad8453e839c5897d335bf8db32c47325 Mon Sep 17 00:00:00 2001 From: Kaz Wolfe Date: Thu, 27 Jun 2024 21:30:58 -0700 Subject: [PATCH] cs sync - partylist explicitly reads MainGroup --- Dalamud/Game/ClientState/Party/PartyList.cs | 12 ++++++------ lib/FFXIVClientStructs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dalamud/Game/ClientState/Party/PartyList.cs b/Dalamud/Game/ClientState/Party/PartyList.cs index d731667f0..b808f0406 100644 --- a/Dalamud/Game/ClientState/Party/PartyList.cs +++ b/Dalamud/Game/ClientState/Party/PartyList.cs @@ -38,25 +38,25 @@ internal sealed unsafe partial class PartyList : IServiceType, IPartyList } /// - public int Length => this.GroupManagerStruct->MemberCount; + public int Length => this.GroupManagerStruct->MainGroup.MemberCount; /// - public uint PartyLeaderIndex => this.GroupManagerStruct->PartyLeaderIndex; + public uint PartyLeaderIndex => this.GroupManagerStruct->MainGroup.PartyLeaderIndex; /// - public bool IsAlliance => this.GroupManagerStruct->AllianceFlags > 0; + public bool IsAlliance => this.GroupManagerStruct->MainGroup.AllianceFlags > 0; /// public IntPtr GroupManagerAddress => this.address.GroupManager; /// - public IntPtr GroupListAddress => (IntPtr)Unsafe.AsPointer(ref GroupManagerStruct->PartyMembers[0]); + public IntPtr GroupListAddress => (IntPtr)Unsafe.AsPointer(ref GroupManagerStruct->MainGroup.PartyMembers[0]); /// - public IntPtr AllianceListAddress => (IntPtr)Unsafe.AsPointer(ref this.GroupManagerStruct->AllianceMembers[0]); + public IntPtr AllianceListAddress => (IntPtr)Unsafe.AsPointer(ref this.GroupManagerStruct->MainGroup.AllianceMembers[0]); /// - public long PartyId => this.GroupManagerStruct->PartyId; + public long PartyId => this.GroupManagerStruct->MainGroup.PartyId; private static int PartyMemberSize { get; } = Marshal.SizeOf(); diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs index ddcbf36eb..53da4ea7d 160000 --- a/lib/FFXIVClientStructs +++ b/lib/FFXIVClientStructs @@ -1 +1 @@ -Subproject commit ddcbf36eb4937e3f66c0d751d1e435b550bcaad4 +Subproject commit 53da4ea7d8655f273d652b4b7182edf85bd5a6a9