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

Merge remote-tracking branch 'origin/master' into net9-rollup

Browse source
This commit is contained in:
github-actions[bot] 2025-03-13 19:34:36 +00:00
commit 18e19f7b49
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/Objects/TargetManager.cs
View file

@ -20,7 +20,7 @@ internal sealed unsafe class TargetManager : IServiceType, ITargetManager
{ {
[ServiceManager.ServiceDependency] [ServiceManager.ServiceDependency]
private readonly ObjectTable objectTable = Service<ObjectTable>.Get(); private readonly ObjectTable objectTable = Service<ObjectTable>.Get();
[ServiceManager.ServiceConstructor] [ServiceManager.ServiceConstructor]
private TargetManager() private TargetManager()
{ {
@ -29,8 +29,8 @@ internal sealed unsafe class TargetManager : IServiceType, ITargetManager
/// <inheritdoc/> /// <inheritdoc/>
public IGameObject? Target public IGameObject? Target
{ {
get => this.objectTable.CreateObjectReference((IntPtr)Struct->Target); get => this.objectTable.CreateObjectReference((IntPtr)Struct->GetHardTarget());
set => Struct->Target = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)value?.Address; set => Struct->SetHardTarget((FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)value?.Address);
} }
/// <inheritdoc/> /// <inheritdoc/>
@ -57,8 +57,8 @@ internal sealed unsafe class TargetManager : IServiceType, ITargetManager
/// <inheritdoc/> /// <inheritdoc/>
public IGameObject? SoftTarget public IGameObject? SoftTarget
{ {
get => this.objectTable.CreateObjectReference((IntPtr)Struct->SoftTarget); get => this.objectTable.CreateObjectReference((IntPtr)Struct->GetSoftTarget());
set => Struct->SoftTarget = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)value?.Address; set => Struct->SetSoftTarget((FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)value?.Address);
} }
/// <inheritdoc/> /// <inheritdoc/>
@ -67,7 +67,7 @@ internal sealed unsafe class TargetManager : IServiceType, ITargetManager
get => this.objectTable.CreateObjectReference((IntPtr)Struct->GPoseTarget); get => this.objectTable.CreateObjectReference((IntPtr)Struct->GPoseTarget);
set => Struct->GPoseTarget = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)value?.Address; set => Struct->GPoseTarget = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)value?.Address;
} }
/// <inheritdoc/> /// <inheritdoc/>
public IGameObject? MouseOverNameplateTarget public IGameObject? MouseOverNameplateTarget
{ {

2
lib/FFXIVClientStructs

@ -1 +1 @@
Subproject commit 484b1b588be5e685855392f090ec9e3eea7b3a71 Subproject commit 2c3e84640af5220b78b944a06fdca79c52144075