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

Invalid contentpackage content types don't crash the game

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-02-25 17:46:04 +02:00
parent 9e2966e9cb
commit 9df0f0a275
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/ContentPackage.cs
+6 -1
View File
@@ -82,7 +82,12 @@ namespace Barotrauma
foreach (XElement subElement in doc.Root.Elements()) foreach (XElement subElement in doc.Root.Elements())
{ {
ContentType type = (ContentType)Enum.Parse(typeof(ContentType), subElement.Name.ToString(), true); ContentType type;
if (!Enum.TryParse(subElement.Name.ToString(), true, out type))
{
DebugConsole.ThrowError("Error in content package \""+name+"\" - \""+subElement.Name.ToString()+"\" is not a valid content type.");
continue;
}
files.Add(new ContentFile(subElement.GetAttributeString("file", ""), type)); files.Add(new ContentFile(subElement.GetAttributeString("file", ""), type));
} }
} }