This commit is contained in:
r00telement
2021-12-05 06:42:12 +00:00
parent 3da3334735
commit 1ea45342c6
3 changed files with 6 additions and 12 deletions

View File

@@ -10,6 +10,7 @@ namespace PlayerTags
[JsonConverter(typeof(StringEnumConverter))]
[JsonProperty("Behavior")]
public InheritableBehavior Behavior;
[JsonProperty("Value")]
[JsonConverter(typeof(GeneralConverter))]
public object Value;

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Authors>r00telement</Authors>
<Version>1.0.0.0</Version>
<Version>1.0.1.0</Version>
</PropertyGroup>
<PropertyGroup>
@@ -20,7 +20,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DalamudPackager" Version="2.1.2" />
<PackageReference Include="DalamudPackager" Version="2.1.5" />
<Reference Include="FFXIVClientStructs">
<HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath>
<Private>false</Private>
@@ -76,12 +76,6 @@
</ItemGroup>
<Target Name="PackagePlugin" AfterTargets="Build">
<DalamudPackager
ProjectDir="$(ProjectDir)"
OutputPath="$(OutputPath)"
AssemblyName="$(AssemblyName)"
MakeZip="true"
Exclude="$(AssemblyName).pdb;$(AssemblyName).deps.json"
/>
<DalamudPackager ProjectDir="$(ProjectDir)" OutputPath="$(OutputPath)" AssemblyName="$(AssemblyName)" MakeZip="true" Exclude="$(AssemblyName).pdb;$(AssemblyName).deps.json" />
</Target>
</Project>

View File

@@ -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