From 4164e36ec45927a2fa72fe71e13434b7c6de7624 Mon Sep 17 00:00:00 2001 From: EvilFactory Date: Mon, 31 Oct 2022 13:40:58 -0300 Subject: [PATCH] Fix Cs mods sometimes being added twice --- .../BarotraumaShared/SharedSource/LuaCs/Cs/CsScriptLoader.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Cs/CsScriptLoader.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Cs/CsScriptLoader.cs index 4c143d09c..e56b9f8a7 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Cs/CsScriptLoader.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Cs/CsScriptLoader.cs @@ -82,9 +82,12 @@ namespace Barotrauma public void SearchFolders() { + var packagesAdded = new HashSet(); var paths = new Dictionary(); foreach (var cp in ContentPackageManager.AllPackages.Concat(ContentPackageManager.EnabledPackages.All)) { + if (packagesAdded.Contains(cp)) { continue; } + var path = $"{Path.GetFullPath(Path.GetDirectoryName(cp.Path)).Replace('\\', '/')}/"; if (ShouldRun(cp, path)) { @@ -99,6 +102,8 @@ namespace Barotrauma { paths.Add(cp.Name, path); } + + packagesAdded.Add(cp); } }