Pilz.NET/Pilz.Dalamud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix duplicated init of NameplateHooks

Browse Source
This commit is contained in:
Pascal
2022-11-05 21:42:40 +01:00
parent fc21145061
commit 353ff6417f
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Pilz.Dalamud/Nameplates/NameplateHooks.cs
View File

@@ -52,7 +52,7 @@ namespace Pilz.Dalamud.Nameplates
/// </summary> /// </summary>
public NameplateHooks() public NameplateHooks()
{ {
Initialize(); SignatureHelper.Initialise(this);
} }
~NameplateHooks() ~NameplateHooks()
@@ -70,7 +70,6 @@ namespace Pilz.Dalamud.Nameplates
/// </summary> /// </summary>
internal void Initialize() internal void Initialize()
{ {
SignatureHelper.Initialise(this);
hook_AddonNamePlate_SetPlayerNameplateDetour?.Enable(); hook_AddonNamePlate_SetPlayerNameplateDetour?.Enable();
} }
@@ -155,7 +154,7 @@ namespace Pilz.Dalamud.Nameplates
// Get new Title string ontent // Get new Title string ontent
var titleNewRaw = managedEventArgs.Title.Encode(); var titleNewRaw = managedEventArgs.Title.Encode();
if (titleRaw.SequenceEqual(titleNewRaw)) if (!titleRaw.SequenceEqual(titleNewRaw))
{ {
eventArgs.TitlePtr = GameInterfaceHelper.PluginAllocate(titleNewRaw); eventArgs.TitlePtr = GameInterfaceHelper.PluginAllocate(titleNewRaw);
freeTitle = true; freeTitle = true;
@@ -163,7 +162,7 @@ namespace Pilz.Dalamud.Nameplates
// Get new Name string ontent // Get new Name string ontent
var nameNewRaw = managedEventArgs.Name.Encode(); var nameNewRaw = managedEventArgs.Name.Encode();
if (nameRaw.SequenceEqual(nameNewRaw)) if (!nameRaw.SequenceEqual(nameNewRaw))
{ {
eventArgs.NamePtr = GameInterfaceHelper.PluginAllocate(nameNewRaw); eventArgs.NamePtr = GameInterfaceHelper.PluginAllocate(nameNewRaw);
freeName = true; freeName = true;
@@ -171,7 +170,7 @@ namespace Pilz.Dalamud.Nameplates
// Get new Free Company string ontent // Get new Free Company string ontent
var freeCompanyNewRaw = managedEventArgs.FreeCompany.Encode(); var freeCompanyNewRaw = managedEventArgs.FreeCompany.Encode();
if (freeCompanyRaw.SequenceEqual(freeCompanyNewRaw)) if (!freeCompanyRaw.SequenceEqual(freeCompanyNewRaw))
{ {
eventArgs.FreeCompanyPtr = GameInterfaceHelper.PluginAllocate(freeCompanyNewRaw); eventArgs.FreeCompanyPtr = GameInterfaceHelper.PluginAllocate(freeCompanyNewRaw);
freeFreeCompany = true; freeFreeCompany = true;

10
Pilz.Dalamud/PluginServices.cs
View File

@@ -14,11 +14,11 @@ namespace Pilz.Dalamud
{ {
public class PluginServices public class PluginServices
{ {
[PluginService] public static GameGui GameGui { get; private set; } = null!; [PluginService] public static GameGui GameGui { get; set; } = null;
[PluginService] public static DalamudPluginInterface PluginInterface { get; private set; } = null!; [PluginService] public static DalamudPluginInterface PluginInterface { get; set; } = null;
[PluginService] public static ClientState ClientState { get; private set; } = null!; [PluginService] public static ClientState ClientState { get; set; } = null;
[PluginService] public static DataManager DataManager { get; private set; } = null!; [PluginService] public static DataManager DataManager { get; set; } = null;
[PluginService] public static ObjectTable ObjectTable { get; private set; } = null!; [PluginService] public static ObjectTable ObjectTable { get; set; } = null;
public static void Initialize(DalamudPluginInterface dalamudPluginInterface) public static void Initialize(DalamudPluginInterface dalamudPluginInterface)
{ {