Merge branch 'master' of https://github.com/Regalis11/Barotrauma

Barotrauma/BarotraumaShared/Source/Items/Components/ItemComponent.cs
2017-12-20 19:46:53 -03:00
parent 7a413aee93 9ed2871ede
commit 07626a1989
75 changed files with 2109 additions and 596 deletions
@@ -171,12 +171,12 @@ namespace Barotrauma
        {
            for (int i = 0; i < children.Count; i++)
            {
-                if (!children[i].UserData.Equals(userData)) continue;
-
-                Select(i, force);
-
-                //if (OnSelected != null) OnSelected(Selected, Selected.UserData);
-                if (!SelectMultiple) return;
+                if ((children[i].UserData != null && children[i].UserData.Equals(userData)) ||
+                    (children[i].UserData == null && userData == null))
+                {
+                    Select(i, force);
+                    if (!SelectMultiple) return;
+                }
            }
        }