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

Merge pull request #75 from oiltanker/master

Browse Source 
fix for non-local mods folder regex and mod assembly type not found
This commit is contained in:
Evil Factory
2022-05-02 11:32:48 -03:00
committed by GitHub
parent 8acbb0dcd1 fb079bf443
commit 776e6d8ffd
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/LuaCs/Cs/CsScriptLoader.cs
+1 -1
View File
@@ -46,7 +46,7 @@ namespace Barotrauma
public bool HasSources { get => sources.Count > 0; } public bool HasSources { get => sources.Count > 0; }
private enum SourceCategory { Shared, Server, Client }; private enum SourceCategory { Shared, Server, Client };
private Regex rMaskPathValid = new Regex(@"^[^/]+/[^/]+/csharp(/(shared|client|server))?(/[^/]+)+\.cs$", RegexOptions.IgnoreCase | RegexOptions.Compiled); private Regex rMaskPathValid = new Regex(@"^(((?!csharp)[^/])+/)+csharp(/(shared|client|server))?(/[^/]+)+\.cs$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
private Regex rMaskPathCategory1 = new Regex(@"/(shared|client|server)(/[^/]+)+\.cs$", RegexOptions.IgnoreCase | RegexOptions.Compiled); private Regex rMaskPathCategory1 = new Regex(@"/(shared|client|server)(/[^/]+)+\.cs$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
private Regex rMaskPathCategory2 = new Regex(@"^/(shared|client|server)", RegexOptions.IgnoreCase | RegexOptions.Compiled); private Regex rMaskPathCategory2 = new Regex(@"^/(shared|client|server)", RegexOptions.IgnoreCase | RegexOptions.Compiled);
private void RunFolder(string folder) private void RunFolder(string folder)
Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsUtility.cs
+1
View File
@@ -432,6 +432,7 @@ namespace Barotrauma
foreach (var elem in typesElem.Elements()) foreach (var elem in typesElem.Elements())
{ {
var type = Type.GetType(elem.Value); var type = Type.GetType(elem.Value);
if (type == null && GameMain.LuaCs?.CsScriptLoader?.Assembly != null) type = GameMain.LuaCs.CsScriptLoader.Assembly.GetType(elem.Value);
if (type == null) throw new Exception($"Type {elem.Value} not found."); if (type == null) throw new Exception($"Type {elem.Value} not found.");
result.Add(type); result.Add(type);