(bf212a41f) v0.9.2.0 pre-release test version

2019-07-27 21:06:07 +03:00
parent afa2137bd2
commit 0f63da27b2
154 changed files with 3959 additions and 1428 deletions
@@ -186,6 +186,15 @@ namespace Barotrauma
                case NetEntityEvent.Type.ChangeProperty:
                    ReadPropertyChange(msg, true, c);
                    break;
+                case NetEntityEvent.Type.Combine:
+                    UInt16 combineTargetID = msg.ReadUInt16();
+                    Item combineTarget = FindEntityByID(combineTargetID) as Item;
+                    if (combineTarget == null || !c.Character.CanInteractWith(this) || !c.Character.CanInteractWith(combineTarget))
+                    {
+                        return;
+                    }
+                    Combine(combineTarget);
+                    break;
            }
        }