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

More descriptive error message when a fabricable item can't be found

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-11-14 20:00:57 +02:00
parent 05f94c2666
commit 5d525865bf
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs
+11 -4
View File
@@ -22,10 +22,10 @@ namespace Barotrauma.Items.Components
{ {
string name = element.GetAttributeString("name", ""); string name = element.GetAttributeString("name", "");
TargetItem = ItemPrefab.list.Find(ip => ip.Name.ToLowerInvariant() == name.ToLowerInvariant()) as ItemPrefab; TargetItem = MapEntityPrefab.list.Find(ip => ip.Name.ToLowerInvariant() == name.ToLowerInvariant()) as ItemPrefab;
if (TargetItem == null) if (TargetItem == null)
{ {
DebugConsole.ThrowError("Error in fabricable item "+name+"! Item \"" + element.Name + "\" not found.");
return; return;
} }
@@ -95,10 +95,17 @@ namespace Barotrauma.Items.Components
foreach (XElement subElement in element.Elements()) foreach (XElement subElement in element.Elements())
{ {
if (subElement.Name.ToString() != "fabricableitem") continue; if (subElement.Name.ToString().ToLowerInvariant() != "fabricableitem") continue;
FabricableItem fabricableItem = new FabricableItem(subElement); FabricableItem fabricableItem = new FabricableItem(subElement);
if (fabricableItem.TargetItem != null) fabricableItems.Add(fabricableItem); if (fabricableItem.TargetItem == null)
{
DebugConsole.ThrowError("Error in item " + item.Name + "! Fabricable item \"" + subElement.GetAttributeString("name", "") + "\" not found.");
}
else
{
fabricableItems.Add(fabricableItem);
}
} }
InitProjSpecific(); InitProjSpecific();