From 8f790545379428a6c085ca315db9115147c3cab3 Mon Sep 17 00:00:00 2001 From: Evil Factory <36804725+evilfactory@users.noreply.github.com> Date: Tue, 19 Apr 2022 13:29:19 -0300 Subject: [PATCH] only use package if enabled --- .../SharedSource/LuaCs/LuaCsSetup.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs index 364579d6b..f0d8030a8 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs @@ -44,7 +44,7 @@ namespace Barotrauma } - public static ContentPackage GetPackage(Identifier name) + public static ContentPackage GetPackage(Identifier name, bool fallbackToAll = true) { foreach (ContentPackage package in ContentPackageManager.LocalPackages) { @@ -54,11 +54,14 @@ namespace Barotrauma } } - foreach (ContentPackage package in ContentPackageManager.AllPackages) + if (fallbackToAll) { - if (package.NameMatches(name)) + foreach (ContentPackage package in ContentPackageManager.AllPackages) { - return package; + if (package.NameMatches(name)) + { + return package; + } } } @@ -355,7 +358,7 @@ namespace Barotrauma // LuaDocs.GenerateDocsAll(); - ContentPackage csPackage = GetPackage("CsForBarotrauma"); + ContentPackage csPackage = GetPackage("CsForBarotrauma", true); if (csPackage != null)