diff --git a/Libraries/SPTarkov.DI/DependencyInjectionRegistrator.cs b/Libraries/SPTarkov.DI/DependencyInjectionRegistrator.cs index 50cc8223..d424f6ba 100644 --- a/Libraries/SPTarkov.DI/DependencyInjectionRegistrator.cs +++ b/Libraries/SPTarkov.DI/DependencyInjectionRegistrator.cs @@ -44,7 +44,7 @@ public static class DependencyInjectionRegistrator return registerableComponents; } ) - .GroupBy(t => t.RegistrableInterface.FullName); + .GroupBy(t => $"{t.RegistrableInterface.Namespace}.{t.RegistrableInterface.Name}"); // We get all injectable services to register them on our services foreach (var groupedInjectables in groupedTypes) { @@ -157,10 +157,7 @@ public static class DependencyInjectionRegistrator RegisterComponents( builderServices, serverLauncherAssembly.GetTypes().Where(type => Attribute.IsDefined(type, typeof(Injectable))) - ); - RegisterComponents( - builderServices, - coreAssembly.GetTypes().Where(type => Attribute.IsDefined(type, typeof(Injectable))) + .Concat(coreAssembly.GetTypes().Where(type => Attribute.IsDefined(type, typeof(Injectable)))) ); } diff --git a/Libraries/SPTarkov.Server.Core/Utils/Logger/SptLogger.cs b/Libraries/SPTarkov.Server.Core/Utils/Logger/SptLogger.cs index 3028d08b..524d0147 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/Logger/SptLogger.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/Logger/SptLogger.cs @@ -5,7 +5,7 @@ using LogLevel = SPTarkov.Server.Core.Models.Spt.Logging.LogLevel; namespace SPTarkov.Server.Core.Utils.Logger; -[Injectable(InjectableTypeOverride = typeof(ISptLogger<>))] +[Injectable(InjectableTypeOverride = typeof(ISptLogger<>), TypePriority = int.MinValue)] public class SptLogger : ISptLogger, IDisposable { private string _category;