vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some runstate if checks

Browse Source
This commit is contained in:
Evil Factory
2025-12-30 14:59:53 -03:00
committed by Maplewheels
parent 6499e7608c
commit d70885711b
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs
+23 -9
View File
@@ -400,20 +400,30 @@ namespace Barotrauma
return;
if (runState > CurrentRunState)
{
if (CurrentRunState < RunState.Parsed)
if (CurrentRunState <= RunState.Parsed)
{
LoadCurrentContentPackageInfos();
if (runState <= CurrentRunState)
return;
}
if (CurrentRunState < RunState.Configuration)
if (runState <= CurrentRunState)
{
return;
}
if (CurrentRunState <= RunState.Configuration)
{
LoadStaticAssets();
}
if (runState <= CurrentRunState)
{
return;
}
if (CurrentRunState < RunState.Running)
if (CurrentRunState <= RunState.Running)
{
RunScripts();
}
}
else if (runState < CurrentRunState)
{
@@ -423,18 +433,22 @@ namespace Barotrauma
ProcessPackagesListDifferences();
_runState = RunState.Configuration;
}
if (runState >= CurrentRunState)
{
return;
}
if (CurrentRunState == RunState.Configuration)
{
UnloadStaticAssets();
_runState = RunState.Parsed;
}
if (runState >= CurrentRunState)
{
return;
}
if (CurrentRunState == RunState.Parsed)
{
@@ -487,7 +501,7 @@ namespace Barotrauma
void LoadStaticAssets()
{
if (CurrentRunState < RunState.Parsed)
if (CurrentRunState <= RunState.Parsed)
{
throw new InvalidOperationException($"{nameof(LoadStaticAssets)} cannot load assets in the '{CurrentRunState}' state.");
}
Barotrauma/BarotraumaShared/SharedSource/LuaCs/Services/LoggerService.cs
+7 -2
View File
@@ -68,7 +68,12 @@ public partial class LoggerService : ILoggerService
public void LogWarning(string message)
{
throw new NotImplementedException();
if (HideUserNames && !Environment.UserName.IsNullOrEmpty())
{
message = message.Replace(Environment.UserName, "USERNAME");
}
Log($"{message}", Color.Yellow, ServerLog.MessageType.ServerMessage);
}
public void LogMessage(string message, Color? serverColor = null, Color? clientColor = null)
@@ -131,7 +136,7 @@ public partial class LoggerService : ILoggerService
public void LogResults(FluentResults.Result result)
{
throw new NotImplementedException();
LogError("LogResults not implemented");
}
public void LogDebug(string message, Color? color = null)