From dd7939b7ec421ea986e876c07fc0c0ed698fc8d8 Mon Sep 17 00:00:00 2001 From: Raymond Date: Thu, 26 Aug 2021 10:28:51 -0400 Subject: [PATCH 1/3] Update BNpc TargetId --- Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs | 3 +++ lib/FFXIVClientStructs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs b/Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs index 4e445beff..611a00f8d 100644 --- a/Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs +++ b/Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs @@ -23,5 +23,8 @@ namespace Dalamud.Game.ClientState.Objects.Types /// Gets the BattleNpc of this BattleNpc. /// public BattleNpcSubKind BattleNpcKind => (BattleNpcSubKind)this.Struct->Character.GameObject.SubKind; + + /// + public override uint TargetObjectId => this.Struct->BattleNpcTargetObjectId; } } diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs index 74556bdfe..f7a29c9fc 160000 --- a/lib/FFXIVClientStructs +++ b/lib/FFXIVClientStructs @@ -1 +1 @@ -Subproject commit 74556bdfe469ed66ba77d613186a0c3d6eeda88d +Subproject commit f7a29c9fcb65f88eb8157e8645dd7231ed0b581a From 24d83f0c94cd8185eb3389c34f7510bf23fe60bc Mon Sep 17 00:00:00 2001 From: Raymond Date: Thu, 26 Aug 2021 10:37:47 -0400 Subject: [PATCH 2/3] Fix breaking changes when updating ClientStructs --- Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs | 2 +- Dalamud/Game/ClientState/Objects/Types/Character.cs | 2 +- lib/FFXIVClientStructs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs b/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs index a7dd836d6..a850f8ac2 100644 --- a/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs +++ b/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs @@ -33,6 +33,6 @@ namespace Dalamud.Game.ClientState.Objects.SubKinds /// /// Gets the target actor ID of the PlayerCharacter. /// - public override uint TargetObjectId => this.Struct->Character.GameObject.TargetObjectID; + public override uint TargetObjectId => this.Struct->Character.TargetObjectID; } } diff --git a/Dalamud/Game/ClientState/Objects/Types/Character.cs b/Dalamud/Game/ClientState/Objects/Types/Character.cs index 17a1ec6f3..ff412d8e5 100644 --- a/Dalamud/Game/ClientState/Objects/Types/Character.cs +++ b/Dalamud/Game/ClientState/Objects/Types/Character.cs @@ -86,7 +86,7 @@ namespace Dalamud.Game.ClientState.Objects.Types /// /// Gets the target object ID of the character. /// - public override uint TargetObjectId => this.Struct->GameObject.TargetObjectID; + public override uint TargetObjectId => this.Struct->TargetObjectID; /// /// Gets the name ID of the character. diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs index f7a29c9fc..47802afd0 160000 --- a/lib/FFXIVClientStructs +++ b/lib/FFXIVClientStructs @@ -1 +1 @@ -Subproject commit f7a29c9fcb65f88eb8157e8645dd7231ed0b581a +Subproject commit 47802afd09afe2cf3bd4c92bedc433c8a5bb9ab3 From db02b8f851eebfa6778860db1825c3a56a55bb85 Mon Sep 17 00:00:00 2001 From: Raymond Date: Thu, 26 Aug 2021 13:12:23 -0400 Subject: [PATCH 3/3] Fix playerChara --- Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs b/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs index a850f8ac2..121dae753 100644 --- a/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs +++ b/Dalamud/Game/ClientState/Objects/SubKinds/PlayerCharacter.cs @@ -33,6 +33,6 @@ namespace Dalamud.Game.ClientState.Objects.SubKinds /// /// Gets the target actor ID of the PlayerCharacter. /// - public override uint TargetObjectId => this.Struct->Character.TargetObjectID; + public override uint TargetObjectId => this.Struct->Character.PlayerTargetObjectID; } }