Fixed transpiler to work on VS runtime

shdwp · Apr 7, 2020 · bf5abd9 · bf5abd9
1 parent 3328100
commit bf5abd9
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/UIExtenderLibModule/Prefab/Patches/WidgetPrefabLoadPatch.cs b/UIExtenderLibModule/Prefab/Patches/WidgetPrefabLoadPatch.cs
@@ -4,6 +4,8 @@
 using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
+using System.Xml;
+using System.Xml.XmlConfiguration;
 using HarmonyLib;
 using TaleWorlds.GauntletUI.PrefabSystem;
 
@@ -27,11 +29,8 @@ internal static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruct
             additions.Add(new CodeInstruction(OpCodes.Call, processIfNeeded));
             additions.Add(new CodeInstruction(OpCodes.Pop));
 
-            var xmlSettingsCtor = "System.Xml.XmlReaderSettings..ctor()";
-            var widgetPrefabCtor = "TaleWorlds.GauntletUI.PrefabSystem.WidgetPrefab..ctor()";
-
-            var from = input.TakeWhile(i => !(i.opcode == OpCodes.Newobj && (i.operand as ConstructorInfo).FullDescription() == xmlSettingsCtor)).Count() + 2;
-            var to = from + input.Skip(from).TakeWhile(i => !(i.opcode == OpCodes.Newobj && (i.operand as ConstructorInfo).FullDescription() == widgetPrefabCtor)).Count();
+            var from = input.TakeWhile(i => !(i.opcode == OpCodes.Newobj && (i.operand as ConstructorInfo).DeclaringType == typeof(XmlReaderSettings))).Count() + 2;
+            var to = from + input.Skip(from).TakeWhile(i => !(i.opcode == OpCodes.Newobj && (i.operand as ConstructorInfo).DeclaringType == typeof(WidgetPrefab))).Count();
             var count = to - from;
 
             instructions.RemoveRange(from, count);