f8b0295...0671290

2019-03-18 22:59:45 +02:00
parent 23687fbf2f
commit 63eb4d64e5
103 changed files with 1378 additions and 4692 deletions
@@ -1631,12 +1631,13 @@ namespace Barotrauma
            SerializableProperty property = extraData[1] as SerializableProperty;
            if (property != null)
            {
+                var propertyOwner = allProperties.Find(p => p.Second == property);
                if (allProperties.Count > 1)
                {
                    msg.WriteRangedInteger(0, allProperties.Count - 1, allProperties.FindIndex(p => p.Second == property));
                }

-                object value = property.GetValue(this);
+                object value = property.GetValue(propertyOwner.First);
                if (value is string)
                {
                    msg.Write((string)value);