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

Rename DataId to BaseId

Browse source
This commit is contained in:
Haselnussbomber 2025-09-08 00:07:17 +02:00
parent 29c4d4939f
commit ea0fcbd713
No known key found for this signature in database
GPG key ID: BB905BB49E7295D1
3 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Dalamud/Game/ClientState/Buddy/BuddyMember.cs
View file

@ -19,8 +19,14 @@ public interface IBuddyMember
/// <summary>
/// Gets the object ID of this buddy.
/// </summary>
[Obsolete("Renamed to EntityId")]
uint ObjectId { get; }
/// <summary>
/// Gets the entity ID of this buddy.
/// </summary>
uint EntityId { get; }
/// <summary>
/// Gets the actor associated with this buddy.
/// </summary>
@ -83,6 +89,9 @@ internal unsafe class BuddyMember : IBuddyMember
/// <inheritdoc />
public uint ObjectId => this.Struct->EntityId;
/// <inheritdoc />
public uint EntityId => this.Struct->EntityId;
/// <inheritdoc />
public IGameObject? GameObject => this.objectTable.SearchById(this.ObjectId);

9
Dalamud/Game/ClientState/Objects/Types/GameObject.cs
View file

@ -35,8 +35,14 @@ public interface IGameObject : IEquatable<IGameObject>
/// <summary>
/// Gets the data ID for linking to other respective game data.
/// </summary>
[Obsolete("Renamed to BaseId")]
public uint DataId { get; }
/// <summary>
/// Gets the base ID for linking to other respective game data.
/// </summary>
public uint BaseId { get; }
/// <summary>
/// Gets the ID of this GameObject's owner.
/// </summary>
@ -208,6 +214,9 @@ internal unsafe partial class GameObject : IGameObject
/// <inheritdoc/>
public uint DataId => this.Struct->BaseId;
/// <inheritdoc/>
public uint BaseId => this.Struct->BaseId;
/// <inheritdoc/>
public uint OwnerId => this.Struct->OwnerId;

11
Dalamud/Game/ClientState/Party/PartyMember.cs
View file

@ -40,8 +40,14 @@ public interface IPartyMember
/// <summary>
/// Gets the actor ID of this party member.
/// </summary>
[Obsolete("Renamed to EntityId")]
uint ObjectId { get; }
/// <summary>
/// Gets the entity ID of this party member.
/// </summary>
uint EntityId { get; }
/// <summary>
/// Gets the actor associated with this buddy.
/// </summary>
@ -140,13 +146,16 @@ internal unsafe class PartyMember : IPartyMember
/// </summary>
public uint ObjectId => this.Struct->EntityId;
/// <inheritdoc/>
public uint EntityId => this.Struct->EntityId;
/// <summary>
/// Gets the actor associated with this buddy.
/// </summary>
/// <remarks>
/// This iterates the actor table, it should be used with care.
/// </remarks>
public IGameObject? GameObject => Service<ObjectTable>.Get().SearchById(this.ObjectId);
public IGameObject? GameObject => Service<ObjectTable>.Get().SearchById(this.EntityId);
/// <summary>
/// Gets the current HP of this party member.