From e5b1f1cf466ffe7da7c310da67d90677eda523ae Mon Sep 17 00:00:00 2001 From: Evil Factory <36804725+evilfactory@users.noreply.github.com> Date: Thu, 5 Aug 2021 15:26:37 -0300 Subject: [PATCH] fixed duplicate log and registered more classes --- .../BarotraumaServer/ServerSource/Lua/LuaClasses.cs | 6 ++++++ .../BarotraumaServer/ServerSource/Lua/LuaSetup.cs | 13 +++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaClasses.cs b/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaClasses.cs index 41d9c6297..cddd6fbac 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaClasses.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaClasses.cs @@ -87,6 +87,11 @@ namespace Barotrauma { GameMain.Server.BanClient(client, reason, range, TimeSpan.FromSeconds(seconds)); } + } + + public static void UnbanPlayer(string player, string endpoint) + { + GameMain.Server.UnbanPlayer(player, endpoint); } @@ -110,6 +115,7 @@ namespace Barotrauma } } + } public class LuaGame diff --git a/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs b/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs index 29c917cf1..e52463508 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs @@ -36,8 +36,9 @@ namespace Barotrauma foreach (var c in GameMain.Server.ConnectedClients) { GameMain.Server.SendDirectChatMessage(message.ToString(), c, ChatMessageType.Console); - GameServer.Log("[LUA] " + message.ToString(), ServerLog.MessageType.ServerMessage); } + + GameServer.Log("[LUA] " + message.ToString(), ServerLog.MessageType.ServerMessage); } } @@ -113,15 +114,19 @@ namespace Barotrauma UserData.RegisterType(); UserData.RegisterType(); UserData.RegisterType(); + UserData.RegisterType(); UserData.RegisterType(); - + UserData.RegisterType(); + UserData.RegisterType(); + UserData.RegisterType(); + UserData.RegisterType(); lua = new Script(CoreModules.Preset_SoftSandbox | CoreModules.LoadMethods); lua.Options.DebugPrint = PrintMessage; lua.Options.ScriptLoader = luaScriptLoader; - + hook = new LuaHook(this); game = new LuaGame(this); @@ -143,7 +148,7 @@ namespace Barotrauma lua.Globals["JobPrefab"] = UserData.CreateStatic(); lua.Globals["TraitorMessageType"] = UserData.CreateStatic(); lua.Globals["CauseOfDeathType"] = UserData.CreateStatic(); - lua.Globals["Affliction"] = UserData.CreateStatic(); + lua.Globals["AfflictionPrefab"] = UserData.CreateStatic(); lua.Globals["Vector2"] = UserData.CreateStatic(); lua.Globals["Vector3"] = UserData.CreateStatic();