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

Merge branch 'unstable-tests' of https://github.com/evilfactory/Barotrauma-lua-attempt into unstable-tests

Browse Source
This commit is contained in:
Oiltanker
2022-04-17 20:41:06 +03:00
parent 7458108fc0 6277a6ce5d
commit 94f0068509
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs
+5 -5
View File
@@ -1257,17 +1257,17 @@ namespace Barotrauma
commands.Add(new Command("install_cl_lua", "Installs client-Side Lua into your client.", (string[] args) => commands.Add(new Command("install_cl_lua", "Installs client-Side Lua into your client.", (string[] args) =>
{ {
ContentPackage luaPackage = LuaCsSetup.GetPackage(); ContentPackage luaCsPackage = LuaCsSetup.GetPackage();
if (luaPackage == null) if (luaCsPackage == null)
{ {
GameMain.Server.SendChatMessage("Couldn't find the LuaForBarotrauma package.", ChatMessageType.ServerMessageBox); GameMain.Server.SendChatMessage("Couldn't find the LuaCsForBarotrauma package.", ChatMessageType.ServerMessageBox);
return; return;
} }
try try
{ {
string path = Path.GetDirectoryName(luaPackage.Path); string path = Path.GetDirectoryName(luaCsPackage.Path);
string[] filesToCopy = new string[] string[] filesToCopy = new string[]
{ {
@@ -1297,7 +1297,7 @@ namespace Barotrauma
File.Copy(Path.Combine(path, "Binary", file), file, true); File.Copy(Path.Combine(path, "Binary", file), file, true);
} }
File.WriteAllText(LuaCsSetup.VERSION_FILE, luaPackage.ModVersion); File.WriteAllText(LuaCsSetup.VERSION_FILE, luaCsPackage.ModVersion);
} }
catch (UnauthorizedAccessException e) catch (UnauthorizedAccessException e)
{ {
Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs
+5 -5
View File
@@ -47,7 +47,7 @@ namespace Barotrauma
{ {
foreach (ContentPackage package in ContentPackageManager.LocalPackages) foreach (ContentPackage package in ContentPackageManager.LocalPackages)
{ {
if (package.NameMatches(new Identifier("LuaForBarotraumaUnstable"))) if (package.NameMatches(new Identifier("LuaCsForBarotraumaUnstable")))
{ {
return package; return package;
} }
@@ -55,7 +55,7 @@ namespace Barotrauma
foreach (ContentPackage package in ContentPackageManager.AllPackages) foreach (ContentPackage package in ContentPackageManager.AllPackages)
{ {
if (package.NameMatches(new Identifier("LuaForBarotraumaUnstable"))) if (package.NameMatches(new Identifier("LuaCsForBarotraumaUnstable")))
{ {
return package; return package;
} }
@@ -372,7 +372,7 @@ namespace Barotrauma
} }
ContentPackage luaPackage = GetPackage(); ContentPackage luaCsPackage = GetPackage();
if (File.Exists(LUASETUP_FILE)) if (File.Exists(LUASETUP_FILE))
{ {
@@ -385,9 +385,9 @@ namespace Barotrauma
HandleException(e); HandleException(e);
} }
} }
else if (luaPackage != null) else if (luaCsPackage != null)
{ {
string path = Path.GetDirectoryName(luaPackage.Path); string path = Path.GetDirectoryName(luaCsPackage.Path);
try try
{ {