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

Unstable 0.17.8.0

Browse Source
This commit is contained in:
Markus Isberg
2022-04-09 03:18:10 +09:00
parent 164d72ae3a
commit 374f03c625
20 changed files with 156 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/ContentManagement/ContentFile/SubmarineFile.cs
+1 -1
View File
@@ -21,7 +21,7 @@ namespace Barotrauma
public override void UnloadFile()
{
SubmarineInfo.RefreshSavedSub(Path.Value);
SubmarineInfo.RemoveSavedSub(Path.Value);
}
public override void Sort()
Barotrauma/BarotraumaShared/SharedSource/ContentManagement/ContentPackageManager.cs
+12 -5
View File
@@ -469,15 +469,22 @@ namespace Barotrauma
}
var corePackageElement = contentPackagesElement.GetChildElement(CorePackageElementName);
var configEnabledCorePackage = findPackage(CorePackages, corePackageElement);
if (configEnabledCorePackage == null)
if (corePackageElement == null)
{
string packageStr = corePackageElement.GetAttributeString("name", null) ?? corePackageElement.GetAttributeStringUnrestricted("path", "UNKNOWN");
DebugConsole.ThrowError($"Could not find the selected core package \"{packageStr}\". Switching to the \"{enabledCorePackage.Name}\" package.");
DebugConsole.AddWarning($"No core package selected. Switching to the \"{enabledCorePackage.Name}\" package.");
}
else
{
enabledCorePackage = configEnabledCorePackage;
var configEnabledCorePackage = findPackage(CorePackages, corePackageElement);
if (configEnabledCorePackage == null)
{
string packageStr = corePackageElement.GetAttributeString("name", null) ?? corePackageElement.GetAttributeStringUnrestricted("path", "UNKNOWN");
DebugConsole.ThrowError($"Could not find the selected core package \"{packageStr}\". Switching to the \"{enabledCorePackage.Name}\" package.");
}
else
{
enabledCorePackage = configEnabledCorePackage;
}
}
var regularPackagesElement = contentPackagesElement.GetChildElement(RegularPackagesElementName);