From 6f971861ece3c321b6f24d2b0ee8a3b8c13c2788 Mon Sep 17 00:00:00 2001 From: Anna Date: Mon, 9 Nov 2020 21:31:03 -0500 Subject: [PATCH] fix: use better signature for summary function --- NoSoliciting/Filter.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/NoSoliciting/Filter.cs b/NoSoliciting/Filter.cs index 01d3593..30408e8 100644 --- a/NoSoliciting/Filter.cs +++ b/NoSoliciting/Filter.cs @@ -13,8 +13,8 @@ namespace NoSoliciting { private delegate void HandlePFPacketDelegate(IntPtr param_1, IntPtr param_2); private readonly Hook handlePacketHook; - private delegate long HandlePFSummaryDelegate(long param_1, long param_2); - private readonly Hook handleSummaryHook; + private delegate long HandlePFSummary2Delegate(long param_1, long param_2, byte param_3); + private readonly Hook handleSummaryHook; private bool disposedValue; @@ -22,7 +22,7 @@ namespace NoSoliciting { this.plugin = plugin ?? throw new ArgumentNullException(nameof(plugin), "Plugin cannot be null"); IntPtr listingPtr = this.plugin.Interface.TargetModuleScanner.ScanText("40 53 41 57 48 83 EC 28 48 8B D9"); - IntPtr summaryPtr = this.plugin.Interface.TargetModuleScanner.ScanText("E8 ?? ?? ?? ?? E9 ?? ?? ?? ?? 48 8B CE E8 ?? ?? ?? ?? 49 8B 07"); + IntPtr summaryPtr = this.plugin.Interface.TargetModuleScanner.ScanText("48 89 5C 24 ?? 48 89 74 24 ?? 57 48 83 EC 20 48 8B FA 48 8B F1 45 84 C0 74 ?? 0F B7 0A"); if (listingPtr == IntPtr.Zero || summaryPtr == IntPtr.Zero) { PluginLog.Log("Party Finder filtering disabled because hook could not be created."); return; @@ -31,7 +31,7 @@ namespace NoSoliciting { this.handlePacketHook = new Hook(listingPtr, new HandlePFPacketDelegate(this.HandlePFPacket)); this.handlePacketHook.Enable(); - this.handleSummaryHook = new Hook(summaryPtr, new HandlePFSummaryDelegate(this.HandleSummary)); + this.handleSummaryHook = new Hook(summaryPtr, new HandlePFSummary2Delegate(this.HandleSummary)); this.handleSummaryHook.Enable(); } @@ -116,10 +116,10 @@ namespace NoSoliciting { this.handlePacketHook.Original(param_1, param_2); } - private long HandleSummary(long param_1, long param_2) { + private long HandleSummary(long param_1, long param_2, byte param_3) { this.clearOnNext = true; - return this.handleSummaryHook.Original(param_1, param_2); + return this.handleSummaryHook.Original(param_1, param_2, param_3); } [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "fulfilling a delegate")]