Merged branch master into new-netcode

2016-09-08 15:34:40 -03:00
parent 1b85dc3646 1f7bf250b5
commit 4763dac21b
7 changed files with 225 additions and 42 deletions
@@ -1547,7 +1547,7 @@ namespace Barotrauma
                ItemPrefab ip = ep as ItemPrefab;
                if (ip == null) continue;

-                if (ip.Name != name) continue;
+                if (ip.Name != name && (ip.Aliases == null || !ip.Aliases.Contains(name))) continue;

                if (rect.Width==0 && rect.Height==0)
                {