From 1ea45342c6f602ccfc003bc86db4aab12fa03592 Mon Sep 17 00:00:00 2001 From: r00telement <47005506+r00telement@users.noreply.github.com> Date: Sun, 5 Dec 2021 06:42:12 +0000 Subject: [PATCH] API5 --- PlayerTags/InheritableData.cs | 1 + PlayerTags/PlayerTags.csproj | 12 +++--------- PlayerTags/PluginHooks.cs | 5 ++--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/PlayerTags/InheritableData.cs b/PlayerTags/InheritableData.cs index eb1e80c..98f25c2 100644 --- a/PlayerTags/InheritableData.cs +++ b/PlayerTags/InheritableData.cs @@ -10,6 +10,7 @@ namespace PlayerTags [JsonConverter(typeof(StringEnumConverter))] [JsonProperty("Behavior")] public InheritableBehavior Behavior; + [JsonProperty("Value")] [JsonConverter(typeof(GeneralConverter))] public object Value; diff --git a/PlayerTags/PlayerTags.csproj b/PlayerTags/PlayerTags.csproj index ff8a90f..0ceb190 100644 --- a/PlayerTags/PlayerTags.csproj +++ b/PlayerTags/PlayerTags.csproj @@ -1,7 +1,7 @@  r00telement - 1.0.0.0 + 1.0.1.0 @@ -20,7 +20,7 @@ - + $(DalamudLibPath)FFXIVClientStructs.dll false @@ -76,12 +76,6 @@ - + diff --git a/PlayerTags/PluginHooks.cs b/PlayerTags/PluginHooks.cs index 1e29cf8..014f14e 100644 --- a/PlayerTags/PluginHooks.cs +++ b/PlayerTags/PluginHooks.cs @@ -176,7 +176,7 @@ namespace PlayerTags var namePlateObjectSize = Marshal.SizeOf(typeof(AddonNamePlate.NamePlateObject)); var namePlateObjectPtr0 = nameplateObjectArrayPtr + namePlateObjectSize * 0; var namePlateIndex = (nameplateObjectPtr.ToInt64() - namePlateObjectPtr0.ToInt64()) / namePlateObjectSize; - if (namePlateIndex < 0 || namePlateIndex >= 50) + if (namePlateIndex < 0 || namePlateIndex >= AddonNamePlate.NumNamePlateObjects) { return null; } @@ -186,8 +186,7 @@ namespace PlayerTags unsafe { var framework = FFXIVClientStructs.FFXIV.Client.System.Framework.Framework.Instance(); - var ui3DModule = framework->GetUiModule()->GetUI3DModule(); - nameplateInfoArrayPtr = new IntPtr(&(framework->GetUiModule()->GetRaptureAtkModule()->NamePlateInfoArray)); + nameplateInfoArrayPtr = new IntPtr(&framework->GetUiModule()->GetRaptureAtkModule()->NamePlateInfoArray); } // Get the nameplate info for the nameplate object