From af80a449706f25de9efc98a7f556a802d18c3b5d Mon Sep 17 00:00:00 2001
From: Regalis <regalis@undertowgames.com>
Date: Fri, 7 Apr 2017 18:12:14 +0300
Subject: [PATCH] Server doesn't apply distance effects to chat messages sent
 by someone without a character (e.g. a client in the lobby, the server
 itself)

---
 Subsurface/Source/Networking/GameServer.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Subsurface/Source/Networking/GameServer.cs b/Subsurface/Source/Networking/GameServer.cs
index 74ac21ef6..d6ab8044b 100644
--- a/Subsurface/Source/Networking/GameServer.cs
+++ b/Subsurface/Source/Networking/GameServer.cs
@@ -1576,8 +1576,7 @@ namespace Barotrauma.Networking
             }
 
             string myReceivedMessage = message;
-
-            if (gameStarted && myCharacter != null)
+            if (gameStarted && myCharacter != null && senderCharacter != null)
             {
                 myReceivedMessage = ApplyChatMsgDistanceEffects(message, (ChatMessageType)type, senderCharacter, myCharacter);
             }