fix ambiguous method call in new versions of the game

BillyGalbreath · Jan 24, 2024 · 4c0152e · 4c0152e
1 parent fb19d5c
commit 4c0152e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/resources/modinfo.json b/resources/modinfo.json
@@ -2,7 +2,7 @@
   "type": "code",
   "name": "Sharable Waypoints",
   "modid": "sharablewaypoints",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Share your waypoints with your group/friends",
   "website": "https://github.com/BillyGalbreath/VS-SharableWaypoints",
   "authors": [ "BillyGalbreath" ],

diff --git a/src/Client/SharableWaypointsClient.cs b/src/Client/SharableWaypointsClient.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
@@ -21,8 +22,16 @@ public class SharableWaypointsClient : Common.SharableWaypoints {
         Harmony.Patch(typeof(GuiDialogAddWayPoint).GetMethod("onSave", BindingFlags.Instance | BindingFlags.NonPublic),
             postfix: typeof(SharableWaypointsClient).GetMethod("PostOnAddSave"));
 
-        Harmony.Patch(typeof(GuiDialogEditWayPoint).GetMethod("TryOpen", BindingFlags.Instance | BindingFlags.Public),
-            prefix: typeof(SharableWaypointsClient).GetMethod("PreEditTryOpen"));
+        try {
+            Harmony.Patch(typeof(GuiDialogEditWayPoint).GetMethod("TryOpen", BindingFlags.Instance | BindingFlags.Public, Array.Empty<Type>()),
+                prefix: typeof(SharableWaypointsClient).GetMethod("PreEditTryOpen"));
+        } catch (Exception) {
+            // Harmony is weird and wont take `typeof(bool)` as a valid type. it required `typeof(System.Boolean)`
+            // ReSharper disable once BuiltInTypeReferenceStyle
+            Harmony.Patch(typeof(GuiDialogEditWayPoint).GetMethod("TryOpen", BindingFlags.Instance | BindingFlags.Public, new[] { typeof(Boolean) }),
+                prefix: typeof(SharableWaypointsClient).GetMethod("PreEditTryOpen"));
+        }
+
         Harmony.Patch(typeof(GuiDialogEditWayPoint).GetMethod("onDelete", BindingFlags.Instance | BindingFlags.NonPublic),
             prefix: typeof(SharableWaypointsClient).GetMethod("PreOnEditDelete"));
         Harmony.Patch(typeof(GuiDialogEditWayPoint).GetMethod("onSave", BindingFlags.Instance | BindingFlags.NonPublic),