Merging from develop

CarbonCommunity · Jun 7, 2024 · 40c4d8c · 40c4d8c
2 parents 77f03ab + 792c40e
commit 40c4d8c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/Carbon.Core/Carbon.Components/Carbon.Bootstrap b/Carbon.Core/Carbon.Components/Carbon.Bootstrap
diff --git a/Carbon.Core/Carbon.Components/Carbon.Common b/Carbon.Core/Carbon.Components/Carbon.Common
diff --git a/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base b/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base
diff --git a/Carbon.Core/Carbon/src/Jobs/ScriptCompilationThread.cs b/Carbon.Core/Carbon/src/Jobs/ScriptCompilationThread.cs
@@ -59,14 +59,14 @@ public class ScriptCompilationThread : BaseThreadedJob
 	internal static ConcurrentDictionary<string, byte[]> _extensionCompilationCache = new();
 	internal static Dictionary<string, PortableExecutableReference> _referenceCache = new();
 	internal static Dictionary<string, PortableExecutableReference> _extensionReferenceCache = new();
-	internal static readonly string[] _libraryDirectories = new[]
-	{
+	internal static readonly string[] _libraryDirectories =
+	[
 		Defines.GetLibFolder(),
 		Defines.GetManagedFolder(),
 		Defines.GetRustManagedFolder(),
 		Defines.GetManagedModulesFolder(),
 		Defines.GetExtensionsFolder()
-	};
+	];
 
 	internal static byte[] _getPlugin(string name)
 	{
@@ -147,12 +147,10 @@ internal void _injectReference(string id, string name, List<MetadataReference> r
 				{
 					foreach (var file in OsEx.Folder.GetFilesWithExtension(directory, "dll"))
 					{
-						if (file.Contains(name))
-						{
-							raw = OsEx.File.ReadBytes(file);
-							found = true;
-							break;
-						}
+						if (!file.Contains(name)) continue;
+						raw = OsEx.File.ReadBytes(file);
+						found = true;
+						break;
 					}
 
 					if (found) break;
@@ -169,12 +167,11 @@ internal void _injectReference(string id, string name, List<MetadataReference> r
 			var processedReference = MetadataReference.CreateFromStream(mem);
 
 			references.Add(processedReference);
-			if (!_referenceCache.ContainsKey(name)) _referenceCache.Add(name, processedReference);
-			else _referenceCache[name] = processedReference;
+			_referenceCache[name] = processedReference;
 			Logger.Debug(id, $"Added common reference '{name}'", 4);
 		}
 	}
-	internal void _injectExtensionReference(string id, string name, List<MetadataReference> references)
+	internal void _injectExtensionReference(string name, List<MetadataReference> references)
 	{
 		if (_extensionReferenceCache.TryGetValue(name, out var reference))
 		{
@@ -233,7 +230,7 @@ internal List<MetadataReference> _addReferences()
 		{
 			try
 			{
-				_injectExtensionReference(id, Path.GetFileName(item.Value.Key), references);
+				_injectExtensionReference(Path.GetFileName(item.Value.Key), references);
 			}
 			catch (System.Exception ex)
 			{
@@ -283,7 +280,7 @@ public override void Start()
 				var extensionFile = Path.Combine(Defines.GetExtensionsFolder(), $"{reference}.dll");
 				if (OsEx.File.Exists(extensionFile))
 				{
-					_injectExtensionReference(reference, extensionFile, references);
+					_injectExtensionReference(extensionFile, references);
 					continue;
 				}