Catch everything when applying Affinity patches

Harmony won't necessarily wrap exceptions in a HarmonyException
Auros · Nov 16, 2024 · 47dffd4 · 47dffd4
1 parent ada953b
commit 47dffd4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/SiraUtil/Affinity/Harmony/HarmonyAffinityPatcher.cs b/SiraUtil/Affinity/Harmony/HarmonyAffinityPatcher.cs
@@ -1,5 +1,6 @@
 using IPA.Loader;
 using SiraUtil.Affinity.Harmony.Generator;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -76,9 +77,9 @@ public void Patch(IAffinity affinity)
                         MethodInfo contract = dynamicHarmonyPatchGenerator.Patch(affinity, affinityMethod, patchType, attribute.Complete ? attribute : classAffinityPatch, priority, before, after);
                         methods.Add(contract);
                     }
-                    catch (HarmonyLib.HarmonyException ex)
+                    catch (Exception ex)
                     {
-                        throw new AffinityException($"Failed to execute patch for method '{affinityMethod}' on '{affinityMethod.DeclaringType.FullName}'", ex);
+                        throw new AffinityException($"Failed to execute patch for method '{affinityMethod}' on '{affinityMethod.DeclaringType.FullName}' (assembly '{affinityMethod.DeclaringType.Assembly.GetName().Name}')", ex);
                     }
                 }
             }