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

Merge pull request #500 from daemitus/bnpc_taretid

Browse source
This commit is contained in:
goaaats 2021-08-26 21:35:25 +02:00 • committed by GitHub
commit 648cbdefc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs
View file

@ -23,5 +23,8 @@ namespace Dalamud.Game.ClientState.Objects.Types
/// Gets the BattleNpc <see cref="BattleNpcSubKind" /> of this BattleNpc. /// Gets the BattleNpc <see cref="BattleNpcSubKind" /> of this BattleNpc.
/// </summary> /// </summary>
public BattleNpcSubKind BattleNpcKind => (BattleNpcSubKind)this.Struct->Character.GameObject.SubKind; public BattleNpcSubKind BattleNpcKind => (BattleNpcSubKind)this.Struct->Character.GameObject.SubKind;
/// <inheritdoc/>
public override uint TargetObjectId => this.Struct->BattleNpcTargetObjectId;
} }
} }

2
Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs
View file

@ -33,6 +33,6 @@ namespace Dalamud.Game.ClientState.Objects.SubKinds
/// <summary> /// <summary>
/// Gets the target actor ID of the PlayerCharacter. /// Gets the target actor ID of the PlayerCharacter.
/// </summary> /// </summary>
public override uint TargetObjectId => this.Struct->Character.GameObject.TargetObjectID; public override uint TargetObjectId => this.Struct->Character.PlayerTargetObjectID;
} }
} }

2
Dalamud/Game/ClientState/Objects/Types/Character.cs
View file

@ -86,7 +86,7 @@ namespace Dalamud.Game.ClientState.Objects.Types
/// <summary> /// <summary>
/// Gets the target object ID of the character. /// Gets the target object ID of the character.
/// </summary> /// </summary>
public override uint TargetObjectId => this.Struct->GameObject.TargetObjectID; public override uint TargetObjectId => this.Struct->TargetObjectID;
/// <summary> /// <summary>
/// Gets the name ID of the character. /// Gets the name ID of the character.

2
lib/FFXIVClientStructs

@ -1 +1 @@
Subproject commit 74556bdfe469ed66ba77d613186a0c3d6eeda88d Subproject commit 47802afd09afe2cf3bd4c92bedc433c8a5bb9ab3