Merge remote-tracking branch 'refs/remotes/origin/new-netcode'

Conflicts: Subsurface/Source/Networking/GameClient.cs
2016-08-30 21:34:11 -03:00
parent 55a2db7c70 2b110588b8
commit 33dc22da05
1 changed files with 2 additions and 2 deletions
--- a/Subsurface/Source/Screens/NetLobbyVoting.cs
+++ b/Subsurface/Source/Screens/NetLobbyVoting.cs
@@ -107,9 +107,9 @@ namespace Barotrauma

                    if (GameMain.Server != null)
                    {
-                        GameMain.Server.SendChatMessage(
+                        /*GameMain.Server.SendChatMessage(
                            ChatMessage.Create("", sender.name + " has voted to kick " + kicked.name, ChatMessageType.Server, null),
-                            GameMain.Server.ConnectedClients);
+                            GameMain.Server.ConnectedClients);*/
                    }

                    break;