Bug fixes

Trojaner · Trojaner · commit 909e85961ee3 · 2021-02-04T18:13:42.000+03:00
diff --git a/src/Jobs/OpenModAssemblyLoadJob.cs b/src/Jobs/OpenModAssemblyLoadJob.cs
@@ -20,18 +20,21 @@ public void ExecuteMigration()
             try
             {
                 var assemblyLoadEvent = (MulticastDelegate)typeof(AppDomain)
-                    .GetField("AssemblyLoad", BindingFlags.NonPublic | BindingFlags.Instance)
+                    .GetField("AssemblyLoad", BindingFlags.NonPublic | BindingFlags.Instance)!
                     .GetValue(AppDomain.CurrentDomain);
 
-                foreach (var @delegate in assemblyLoadEvent.GetInvocationList())
+                if (assemblyLoadEvent != null)
                 {
-                    var asmFullName = @delegate?.GetMethodInfo()?.DeclaringType?.Assembly?.FullName;
-                    if (asmFullName != null && (asmFullName.StartsWith("AviRockets.Module", StringComparison.OrdinalIgnoreCase)
-                        || asmFullName.StartsWith("AviRockets.Mothership", StringComparison.OrdinalIgnoreCase)))
+                    foreach (var @delegate in assemblyLoadEvent.GetInvocationList())
                     {
-                        var eventHandler = (AssemblyLoadEventHandler)@delegate;
-                        AppDomain.CurrentDomain.AssemblyLoad -= eventHandler;
-                        aviEvents.Add(eventHandler);
+                        var asmFullName = @delegate?.GetMethodInfo()?.DeclaringType?.Assembly?.FullName;
+                        if (asmFullName != null && (asmFullName.StartsWith("AviRockets.Module", StringComparison.OrdinalIgnoreCase)
+                            || asmFullName.StartsWith("AviRockets.Mothership", StringComparison.OrdinalIgnoreCase)))
+                        {
+                            var eventHandler = (AssemblyLoadEventHandler)@delegate;
+                            AppDomain.CurrentDomain.AssemblyLoad -= eventHandler;
+                            aviEvents.Add(eventHandler);
+                        }
                     }
                 }
 
diff --git a/src/OpenModManager.cs b/src/OpenModManager.cs
@@ -21,7 +21,7 @@ public OpenModManager()
             foreach (var moduleDirectory in Directory.GetDirectories(modulesDirectory))
             {
                 var isModuleFilePresent = Directory
-                    .GetFiles(moduleDirectory, "*.module,", SearchOption.TopDirectoryOnly)
+                    .GetFiles(moduleDirectory, "*.module", SearchOption.TopDirectoryOnly)
                     .Length > 0;
 
                 // Not an Unturned module

Original file line number	Diff line number	Diff line change
`@@ -20,18 +20,21 @@ public void ExecuteMigration()`
`20`	`20`	`try`
`21`	`21`	`{`
`22`	`22`	`var assemblyLoadEvent = (MulticastDelegate)typeof(AppDomain)`
`23`		`- .GetField("AssemblyLoad", BindingFlags.NonPublic \| BindingFlags.Instance)`
	`23`	`+ .GetField("AssemblyLoad", BindingFlags.NonPublic \| BindingFlags.Instance)!`
`24`	`24`	`.GetValue(AppDomain.CurrentDomain);`
`25`	`25`
`26`		`- foreach (var @delegate in assemblyLoadEvent.GetInvocationList())`
	`26`	`+ if (assemblyLoadEvent != null)`
`27`	`27`	`{`
`28`		`- var asmFullName = @delegate?.GetMethodInfo()?.DeclaringType?.Assembly?.FullName;`
`29`		`- if (asmFullName != null && (asmFullName.StartsWith("AviRockets.Module", StringComparison.OrdinalIgnoreCase)`
`30`		`- \|\| asmFullName.StartsWith("AviRockets.Mothership", StringComparison.OrdinalIgnoreCase)))`
	`28`	`+ foreach (var @delegate in assemblyLoadEvent.GetInvocationList())`
`31`	`29`	`{`
`32`		`- var eventHandler = (AssemblyLoadEventHandler)@delegate;`
`33`		`- AppDomain.CurrentDomain.AssemblyLoad -= eventHandler;`
`34`		`- aviEvents.Add(eventHandler);`
	`30`	`+ var asmFullName = @delegate?.GetMethodInfo()?.DeclaringType?.Assembly?.FullName;`
	`31`	`+ if (asmFullName != null && (asmFullName.StartsWith("AviRockets.Module", StringComparison.OrdinalIgnoreCase)`
	`32`	`+ \|\| asmFullName.StartsWith("AviRockets.Mothership", StringComparison.OrdinalIgnoreCase)))`
	`33`	`+ {`
	`34`	`+ var eventHandler = (AssemblyLoadEventHandler)@delegate;`
	`35`	`+ AppDomain.CurrentDomain.AssemblyLoad -= eventHandler;`
	`36`	`+ aviEvents.Add(eventHandler);`
	`37`	`+ }`
`35`	`38`	`}`
`36`	`39`	`}`
`37`	`40`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public OpenModManager()`
`21`	`21`	`foreach (var moduleDirectory in Directory.GetDirectories(modulesDirectory))`
`22`	`22`	`{`
`23`	`23`	`var isModuleFilePresent = Directory`
`24`		`- .GetFiles(moduleDirectory, "*.module,", SearchOption.TopDirectoryOnly)`
	`24`	`+ .GetFiles(moduleDirectory, "*.module", SearchOption.TopDirectoryOnly)`
`25`	`25`	`.Length > 0;`
`26`	`26`
`27`	`27`	`// Not an Unturned module`