Fixed an issue with Il2Cpp Class Injection Attributes causing excepti…

…ons to be thrown on Mono games
LavaGang · Sep 30, 2024 · 3512c92 · 3512c92
1 parent 1a33c45
commit 3512c92
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/MelonLoader/Attributes/RegisterTypeInIl2CppWithInterfaces.cs b/MelonLoader/Attributes/RegisterTypeInIl2CppWithInterfaces.cs
@@ -11,6 +11,7 @@ public class RegisterTypeInIl2CppWithInterfaces : Attribute //Naming violation?
         internal static List<Assembly> registrationQueue = new List<Assembly>();
         internal static bool ready;
         internal bool LogSuccess = true;
+
         internal Type[] Interfaces;
         internal bool GetInterfacesFromType;
 

diff --git a/MelonLoader/Core.cs b/MelonLoader/Core.cs
@@ -142,8 +142,11 @@ internal static int Start()
                 return 1;
 
             AddUnityDebugLog();
+
+#if NET6_0_OR_GREATER
             RegisterTypeInIl2Cpp.SetReady();
             RegisterTypeInIl2CppWithInterfaces.SetReady();
+#endif
 
             MelonEvents.MelonHarmonyInit.Invoke();
             MelonEvents.OnApplicationStart.Invoke();

diff --git a/MelonLoader/Melons/MelonAssembly.cs b/MelonLoader/Melons/MelonAssembly.cs
@@ -290,8 +290,10 @@ public void LoadMelons()
                 }
             }
 
+#if NET6_0_OR_GREATER
             RegisterTypeInIl2Cpp.RegisterAssembly(Assembly);
             RegisterTypeInIl2CppWithInterfaces.RegisterAssembly(Assembly);
+#endif
 
             if (rottenMelons.Count != 0)
             {