From ce85d50dbfda9e9369c1adaaed774d9a8b9f057b Mon Sep 17 00:00:00 2001 From: Evil Factory <36804725+evilfactory@users.noreply.github.com> Date: Tue, 19 Apr 2022 13:31:25 -0300 Subject: [PATCH] prioritize enabled package --- .../SharedSource/LuaCs/LuaCsSetup.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs index f0d8030a8..209fec874 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs @@ -46,7 +46,7 @@ namespace Barotrauma public static ContentPackage GetPackage(Identifier name, bool fallbackToAll = true) { - foreach (ContentPackage package in ContentPackageManager.LocalPackages) + foreach (ContentPackage package in ContentPackageManager.EnabledPackages.All) { if (package.NameMatches(name)) { @@ -56,6 +56,14 @@ namespace Barotrauma if (fallbackToAll) { + foreach (ContentPackage package in ContentPackageManager.LocalPackages) + { + if (package.NameMatches(name)) + { + return package; + } + } + foreach (ContentPackage package in ContentPackageManager.AllPackages) { if (package.NameMatches(name)) @@ -358,7 +366,7 @@ namespace Barotrauma // LuaDocs.GenerateDocsAll(); - ContentPackage csPackage = GetPackage("CsForBarotrauma", true); + ContentPackage csPackage = GetPackage("CsForBarotrauma", false); if (csPackage != null)