Merged branch master into master

2016-08-30 17:36:11 -03:00
parent 52270e3a35 2e2043bf7f
commit 9c116fc268
6 changed files with 49 additions and 9 deletions
--- a/Subsurface/Source/Networking/GameServer.cs
+++ b/Subsurface/Source/Networking/GameServer.cs
@@ -1522,7 +1522,7 @@ namespace Barotrauma.Networking
            }
            else
            {
-                GameServer.Log(message.Text, message.Color);
+                GameServer.Log(message.TextWithSender, message.Color);
            }
            sender.ChatSpamSpeed += 5.0f;