From 7ee81aca247c73c1acca5a5e72689df4625ec7d0 Mon Sep 17 00:00:00 2001 From: Evil Factory <36804725+evilfactory@users.noreply.github.com> Date: Sat, 21 May 2022 12:48:35 -0300 Subject: [PATCH] fix formatting --- .../BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs | 3 ++- .../BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs | 8 +++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs index b21ef9909..76966ee0c 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsHook.cs @@ -225,7 +225,8 @@ namespace Barotrauma private static readonly string[] prohibitedHooks = { "Barotrauma.Lua", - "Barotrauma.Cs" + "Barotrauma.Cs", + "ContentPackageManager", }; public void HookMethod(string identifier, MethodInfo method, LuaCsPatch patch, HookMethodType hookType = HookMethodType.Before, ACsMod owner = null) { diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs index 1d8211b84..d73a77895 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs @@ -39,7 +39,7 @@ namespace Barotrauma public const bool IsClient = true; #endif - private static int ExecutionNumber = 0; + private static int executionNumber = 0; private Script lua; public CsScriptRunner CsScript { get; private set; } @@ -416,7 +416,7 @@ namespace Barotrauma lua.Globals["Networking"] = Networking; lua.Globals["Steam"] = Steam; - lua.Globals["ExecutionNumber"] = ExecutionNumber; + lua.Globals["ExecutionNumber"] = executionNumber; lua.Globals["SERVER"] = IsServer; lua.Globals["CLIENT"] = IsClient; @@ -458,8 +458,6 @@ modding needs. var modTypes = CsScriptLoader.Compile(); modTypes.ForEach(t => { - //Please register `t` in lua-side - //UserData.RegisterType(t); t.GetConstructor(new Type[] { })?.Invoke(null); }); } @@ -504,7 +502,7 @@ modding needs. PrintError("LuaSetup.lua not found! Lua/LuaSetup.lua, no Lua scripts will be executed or work."); } - ExecutionNumber++; + executionNumber++; } }