Merge pull request #639 from Banane9/fix/wrong-original-method-#638

Fix #638 by preventing the NullReferenceException
pardeike · Dec 17, 2024 · cd43272 · cd43272
2 parents f957040 + ea661ef
commit cd43272
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Harmony/Internal/PatchTools.cs b/Harmony/Internal/PatchTools.cs
@@ -96,13 +96,13 @@ internal static MethodBase GetOriginalMethod(this HarmonyMethod attr)
 
 					case MethodType.Getter:
 						if (attr.methodName is null)
-							return AccessTools.DeclaredIndexer(attr.declaringType, attr.argumentTypes).GetGetMethod(true);
-						return AccessTools.DeclaredProperty(attr.declaringType, attr.methodName).GetGetMethod(true);
+							return AccessTools.DeclaredIndexerGetter(attr.declaringType, attr.argumentTypes);
+						return AccessTools.DeclaredPropertyGetter(attr.declaringType, attr.methodName);
 
 					case MethodType.Setter:
 						if (attr.methodName is null)
-							return AccessTools.DeclaredIndexer(attr.declaringType, attr.argumentTypes).GetSetMethod(true);
-						return AccessTools.DeclaredProperty(attr.declaringType, attr.methodName).GetSetMethod(true);
+							return AccessTools.DeclaredIndexerSetter(attr.declaringType, attr.argumentTypes);
+						return AccessTools.DeclaredPropertySetter(attr.declaringType, attr.methodName);
 
 					case MethodType.Constructor:
 						return AccessTools.DeclaredConstructor(attr.declaringType, attr.argumentTypes);