From 55752b592f6bf2e2aa79328b9108b06ce7c9e8c7 Mon Sep 17 00:00:00 2001 From: Evil Factory <36804725+evilfactory@users.noreply.github.com> Date: Sun, 10 Apr 2022 14:06:13 -0300 Subject: [PATCH] *actually* fix content packages --- .../SharedSource/Lua/LuaSetup.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaSetup.cs index 860a7d05f..ec258cfeb 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Lua/LuaSetup.cs @@ -26,17 +26,23 @@ namespace Barotrauma public static ContentPackage GetLuaPackage() { - ContentPackage luaPackage = null; - - foreach (ContentPackage package in ContentPackageManager.EnabledPackages.All) + foreach (ContentPackage package in ContentPackageManager.LocalPackages) { if (package.NameMatches(new Identifier("LuaForBarotraumaUnstable"))) { - luaPackage = package; + return package; } } - return luaPackage; + foreach (ContentPackage package in ContentPackageManager.AllPackages) + { + if (package.NameMatches(new Identifier("LuaForBarotraumaUnstable"))) + { + return package; + } + } + + return null; } public void HandleLuaException(Exception ex, string extra = "")