(d5ea3c7d5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-03-29 17:24:17 +02:00
parent ca08b803dc
commit ddfd7274e9
22 changed files with 230 additions and 99 deletions
@@ -7,7 +7,7 @@ namespace Barotrauma.Items.Components
    {
        public void ClientRead(ServerNetObject type, NetBuffer msg, float sendingTime)
        {
-            DeattachTimer = msg.ReadSingle();
+            deattachTimer = msg.ReadSingle();
            if (deattachTimer >= DeattachDuration)
            {
                holdable.DeattachFromWall();