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

Fix check ready to run not working properly

Browse Source
This commit is contained in:
Evil Factory
2026-03-15 18:44:15 -03:00
parent b402e09b82
commit 8717706b1c
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsSetup.cs
View File

@@ -15,14 +15,13 @@ namespace Barotrauma
partial class LuaCsSetup
{
private bool _isClientPromptActive;
/// <summary>
///
/// Returns whether execution should continue
/// </summary>
/// <returns>Returns whether execution should continue.</returns>
public bool CheckReadyToRun()
{
// fast exit if enabled or unavailable.
// Fast exit if enabled
if (this.IsCsEnabled)
{
return true;
@@ -32,10 +31,24 @@ namespace Barotrauma
foreach (ContentPackage cp in PackageManagementService.GetLoadedAssemblyPackages())
{
if (cp.NameMatches(PackageId))
{
continue;
}
if (cp.UgcId.TryUnwrap(out ContentPackageId id))
{
sb.AppendLine($"- {cp.Name} ({id})");
}
else
{
sb.AppendLine($"- {cp.Name} (Not On Workshop)");
}
}
if (string.IsNullOrEmpty(sb.ToString()))
{
return true;
}
if (!_isClientPromptActive)
@@ -44,16 +57,18 @@ namespace Barotrauma
if (GameMain.Client == null || GameMain.Client.IsServerOwner)
{
DisplayCsModsPromptServer(sb);
return true;
}
else
{
DisplayCsModsPromptClient(sb);
return false;
}
}
return false;
else
{
return false;
}
void DisplayCsModsPromptServer(StringBuilder sb)
{
@@ -104,6 +119,8 @@ namespace Barotrauma
// avoid a TOCTOU scenario.
this.IsCsEnabled = false;
this._isClientPromptActive = false;
SetRunState(RunState.LoadedNoExec);
SetRunState(RunState.Running);
return true;
}
finally

8
Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs
View File

@@ -24,6 +24,8 @@ namespace Barotrauma
partial class LuaCsSetup : IDisposable, IEventScreenSelected, IEventEnabledPackageListChanged,
IEventReloadAllPackages
{
public const string PackageId = "LuaCsForBarotrauma";
private static LuaCsSetup _luaCsSetup;
public static LuaCsSetup Instance => _luaCsSetup ??= new LuaCsSetup();
@@ -145,9 +147,9 @@ namespace Barotrauma
void LoadLuaCsConfig()
{
var luaCsPackage = ContentPackageManager.EnabledPackages.Regular.FirstOrDefault(cp => cp.NameMatches("LuaCsForBarotrauma"), null)
?? ContentPackageManager.LocalPackages.FirstOrDefault(cp => cp.NameMatches("LuaCsForBarotrauma"))
?? ContentPackageManager.WorkshopPackages.FirstOrDefault(cp => cp.NameMatches("LuaCsForBarotrauma"));
var luaCsPackage = ContentPackageManager.EnabledPackages.Regular.FirstOrDefault(cp => cp.NameMatches(PackageId), null)
?? ContentPackageManager.LocalPackages.FirstOrDefault(cp => cp.NameMatches(PackageId))
?? ContentPackageManager.WorkshopPackages.FirstOrDefault(cp => cp.NameMatches(PackageId));
_isCsEnabled =
ConfigService.TryGetConfig<ISettingBase<bool>>(luaCsPackage, "IsCsEnabled", out var val1)