Merge remote-tracking branch 'origin/master' into antagonists

2017-12-03 13:10:04 +03:00
parent 56df7b6900 ddf9ad26b8
commit ca535d295f
29 changed files with 359 additions and 248 deletions
@@ -1873,11 +1873,6 @@ namespace Barotrauma.Networking

        private void FileTransferChanged(FileSender.FileTransferOut transfer)
        {
-            if (connectedClients.Any(c=> c.Connection == null))
-            {
-                int sdfgsdfg = 1;
-            }
-
            Client recipient = connectedClients.Find(c => c.Connection == transfer.Connection);
 #if CLIENT
            UpdateFileTransferIndicator(recipient);