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

better distinguish better client and server Lua and fixed crash when force stopping the game via alt f4

Browse Source
This commit is contained in:
Evil Factory
2022-03-19 11:05:26 -03:00
parent f7155c4fcc
commit 7dfccab05d
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Lua/LuaSetup.cs
+13 -8
View File
@@ -56,7 +56,11 @@ namespace Barotrauma
string errorMsg = subStr; string errorMsg = subStr;
if (i == 0) if (i == 0)
errorMsg = "[LUA ERROR] " + errorMsg; #if SERVER
errorMsg = "[SV LUA ERROR] " + errorMsg;
#else
errorMsg = "[CL LUA ERROR] " + errorMsg;
#endif
DebugConsole.ThrowError(errorMsg); DebugConsole.ThrowError(errorMsg);
@@ -95,11 +99,13 @@ namespace Barotrauma
GameServer.Log("[LUA] " + subStr, ServerLog.MessageType.ServerMessage); GameServer.Log("[LUA] " + subStr, ServerLog.MessageType.ServerMessage);
} }
#endif #endif
DebugConsole.NewMessage(message.ToString(), Color.MediumPurple);
} }
#if SERVER
DebugConsole.NewMessage(message.ToString(), Color.MediumPurple);
#else
DebugConsole.NewMessage(message.ToString(), Color.Purple);
#endif
} }
public DynValue DoString(string code, Table globalContext = null, string codeStringFriendly = null) public DynValue DoString(string code, Table globalContext = null, string codeStringFriendly = null)
@@ -202,11 +208,10 @@ namespace Barotrauma
public void Stop() public void Stop()
{ {
if (harmony != null) harmony?.UnpatchAll();
harmony.UnpatchAll();
game.Stop(); game?.Stop();
hook.Call("stop", new object[] { }); hook?.Call("stop", new object[] { });
hook = null; hook = null;
game = null; game = null;