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

Conflicts:
	Subsurface/Source/Networking/GameClient.cs
This commit is contained in:
juanjp600
2016-08-30 21:34:11 -03:00
+2 -2
View File
@@ -107,9 +107,9 @@ namespace Barotrauma
if (GameMain.Server != null) if (GameMain.Server != null)
{ {
GameMain.Server.SendChatMessage( /*GameMain.Server.SendChatMessage(
ChatMessage.Create("", sender.name + " has voted to kick " + kicked.name, ChatMessageType.Server, null), ChatMessage.Create("", sender.name + " has voted to kick " + kicked.name, ChatMessageType.Server, null),
GameMain.Server.ConnectedClients); GameMain.Server.ConnectedClients);*/
} }
break; break;