moved lua initialization to be after the server is running
This commit is contained in:
@@ -137,9 +137,6 @@ namespace Barotrauma
|
|||||||
NetLobbyScreen = new NetLobbyScreen();
|
NetLobbyScreen = new NetLobbyScreen();
|
||||||
|
|
||||||
CheckContentPackage();
|
CheckContentPackage();
|
||||||
|
|
||||||
Lua = new LuaSetup();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -197,6 +197,8 @@ namespace Barotrauma.Networking
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
GameMain.Lua = new LuaSetup();
|
||||||
|
|
||||||
TickRate = serverSettings.TickRate;
|
TickRate = serverSettings.TickRate;
|
||||||
|
|
||||||
Log("Server started", ServerLog.MessageType.ServerMessage);
|
Log("Server started", ServerLog.MessageType.ServerMessage);
|
||||||
@@ -3842,7 +3844,8 @@ namespace Barotrauma.Networking
|
|||||||
{
|
{
|
||||||
if (GameMain.Server == null || !GameMain.Server.ServerSettings.SaveServerLogs) { return; }
|
if (GameMain.Server == null || !GameMain.Server.ServerSettings.SaveServerLogs) { return; }
|
||||||
|
|
||||||
GameMain.Lua.hook.Call("serverLog", new object[] { line, messageType });
|
if(GameMain.Lua != null)
|
||||||
|
GameMain.Lua.hook.Call("serverLog", new object[] { line, messageType });
|
||||||
|
|
||||||
GameMain.Server.ServerSettings.ServerLog.WriteLine(line, messageType);
|
GameMain.Server.ServerSettings.ServerLog.WriteLine(line, messageType);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user