Skip to content

Commit 2f2474c

Browse files
- Fixed compilation bug for ILoggerService.
1 parent ac0215b commit 2f2474c

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,11 @@ partial class LuaCsSetup
5858
public static ContentPackageId CsForBarotraumaId = new SteamWorkshopId(2795927223);
5959
private const string configFileName = "LuaCsSetupConfig.xml";
6060

61-
protected ILoggerService Logger { get; private set; }
61+
protected ILoggerService Logger => _servicesProvider.TryGetService<ILoggerService>(out var svc)
62+
? svc
63+
: throw new NullReferenceException("Logger service not found!");
6264

63-
private IServicesProvider servicesProvider;
65+
private readonly IServicesProvider _servicesProvider;
6466

6567
#if SERVER
6668
public const bool IsServer = true;
@@ -120,13 +122,8 @@ private bool ShouldRunCs
120122

121123
public LuaCsSetup()
122124
{
123-
servicesProvider = new ServicesProvider();
124-
servicesProvider.RegisterServiceType<ILoggerService, LoggerService>(ServiceLifetime.Singleton);
125-
126-
if (servicesProvider.TryGetService(out ILoggerService logger))
127-
{
128-
Logger = logger;
129-
}
125+
_servicesProvider = new ServicesProvider();
126+
_servicesProvider.RegisterServiceType<ILoggerService, LoggerService>(ServiceLifetime.Singleton);
130127
}
131128

132129
[Obsolete("Use AssemblyManager::GetTypesByName()")]

Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/ServicesProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ private ServiceContainer ServiceContainer
5050
{
5151
_serviceLock.EnterReadLock();
5252
ServiceContainer.Register<TSvcInterface, TService>(lifetimeInstance);
53-
ServiceContainer.Compile<TService>();
53+
ServiceContainer.Compile();
5454
OnServiceRegistered?.Invoke(typeof(TSvcInterface), typeof(TService));
5555
}
5656
finally

0 commit comments

Comments
 (0)