diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs index c0811c934..343494749 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs @@ -41,8 +41,6 @@ namespace Barotrauma } _runStateMachine = SetupStateMachine(); SubscribeToLuaCsEvents(); - SetRunState(RunState.LoadedNoExec); - LoadLuaCsConfig(); } bool ValidateLuaCsContent() @@ -258,7 +256,7 @@ namespace Barotrauma Logger.LogResults(PackageManagementService.StopRunningPackages()); } - if (PackageManagementService.IsAnyPackageRunning()) + if (PackageManagementService.IsAnyPackageLoaded()) { DisposeLuaCsConfig(); Logger.LogResults(PackageManagementService.UnloadAllPackages()); @@ -353,9 +351,7 @@ namespace Barotrauma /// /// The new game screen. public partial void OnScreenSelected(Screen screen); - - void DisposeLuaCsConfig() { IsCsEnabled = null; diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/StateMachine.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/StateMachine.cs index 79dc5779f..99f8ac1fe 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/StateMachine.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/StateMachine.cs @@ -87,7 +87,7 @@ public class State where T : Enum { public T StateId; private Action> _onEnter, _onExit; - public State(T stateId, Action> onExitState, Action> onEnterState) + public State(T stateId, Action> onEnterState, Action> onExitState) { StateId = stateId; _onEnter = onEnterState;