ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

cs sync

Browse source 
- partylist explicitly reads MainGroup
This commit is contained in:
Kaz Wolfe 2024-06-27 21:30:58 -07:00
parent f099e26fa9
commit 5471fb3fad
No known key found for this signature in database
GPG key ID: 258813F53A16EBB4
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,25 +38,25 @@ internal sealed unsafe partial class PartyList : IServiceType, IPartyList
}
/// <inheritdoc/>
public int Length => this.GroupManagerStruct->MemberCount;
public int Length => this.GroupManagerStruct->MainGroup.MemberCount;
/// <inheritdoc/>
public uint PartyLeaderIndex => this.GroupManagerStruct->PartyLeaderIndex;
public uint PartyLeaderIndex => this.GroupManagerStruct->MainGroup.PartyLeaderIndex;
/// <inheritdoc/>
public bool IsAlliance => this.GroupManagerStruct->AllianceFlags > 0;
public bool IsAlliance => this.GroupManagerStruct->MainGroup.AllianceFlags > 0;
/// <inheritdoc/>
public IntPtr GroupManagerAddress => this.address.GroupManager;
/// <inheritdoc/>
public IntPtr GroupListAddress => (IntPtr)Unsafe.AsPointer(ref GroupManagerStruct->PartyMembers[0]);
public IntPtr GroupListAddress => (IntPtr)Unsafe.AsPointer(ref GroupManagerStruct->MainGroup.PartyMembers[0]);
/// <inheritdoc/>
public IntPtr AllianceListAddress => (IntPtr)Unsafe.AsPointer(ref this.GroupManagerStruct->AllianceMembers[0]);
public IntPtr AllianceListAddress => (IntPtr)Unsafe.AsPointer(ref this.GroupManagerStruct->MainGroup.AllianceMembers[0]);
/// <inheritdoc/>
public long PartyId => this.GroupManagerStruct->PartyId;
public long PartyId => this.GroupManagerStruct->MainGroup.PartyId;
private static int PartyMemberSize { get; } = Marshal.SizeOf<FFXIVClientStructs.FFXIV.Client.Game.Group.PartyMember>();

2
lib/FFXIVClientStructs

@ -1 +1 @@
Subproject commit ddcbf36eb4937e3f66c0d751d1e435b550bcaad4
Subproject commit 53da4ea7d8655f273d652b4b7182edf85bd5a6a9