v0.10.5.1

This commit is contained in:
Juan Pablo Arce
2020-09-22 11:31:56 -03:00
parent 44032d0ae0
commit 0002ad2c50
343 changed files with 12276 additions and 5023 deletions
@@ -134,7 +134,7 @@ namespace Barotrauma
private bool CheckContained(Item parentItem)
{
var containedItems = parentItem.ContainedItems;
var containedItems = parentItem.OwnInventory?.Items;
if (containedItems == null) { return false; }
if (MatchOnEmpty && !containedItems.Any(ci => ci != null))
@@ -221,9 +221,15 @@ namespace Barotrauma
string typeStr = element.GetAttributeString("type", "");
if (string.IsNullOrEmpty(typeStr))
{
if (element.Name.ToString().Equals("containable", StringComparison.OrdinalIgnoreCase))
switch (element.Name.ToString().ToLowerInvariant())
{
typeStr = "Contained";
case "containable":
typeStr = "Contained";
break;
case "suitablefertilizer":
case "suitableseed":
typeStr = "None";
break;
}
}
if (!Enum.TryParse(typeStr, true, out ri.type))