From 1e09de042557a00d41a0341250784e93ea3a8b9d Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Fri, 18 Dec 2020 21:10:03 +1100
Subject: [PATCH] Don't show + in names in connect/disconnect logs

---
 MCGalaxy/Commands/Moderation/CmdFreeze.cs | 2 +-
 MCGalaxy/Network/BaseWebSocket.cs         | 3 ++-
 MCGalaxy/Player/Player.Login.cs           | 4 ++--
 MCGalaxy/Player/Player.cs                 | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/MCGalaxy/Commands/Moderation/CmdFreeze.cs b/MCGalaxy/Commands/Moderation/CmdFreeze.cs
index 4f3570cc6..5783d8aa3 100644
--- a/MCGalaxy/Commands/Moderation/CmdFreeze.cs
+++ b/MCGalaxy/Commands/Moderation/CmdFreeze.cs
@@ -38,7 +38,7 @@ namespace MCGalaxy.Commands.Moderation {
             if (Server.frozen.Contains(target)) {
                 DoUnfreeze(p, target, args);
             } else {
-                // unmute has second argument as reason, mute has third argument instead
+                // unfreeze has second argument as reason, freeze has third argument instead
                 DoFreeze(p, target, message.SplitSpaces(3));
             }
         }
diff --git a/MCGalaxy/Network/BaseWebSocket.cs b/MCGalaxy/Network/BaseWebSocket.cs
index db7a20f4a..065651d08 100644
--- a/MCGalaxy/Network/BaseWebSocket.cs
+++ b/MCGalaxy/Network/BaseWebSocket.cs
@@ -222,12 +222,13 @@ namespace MCGalaxy.Network {
             packet[0] = 0x88; // FIN BIT, close opcode
             packet[1] = 2;
             packet[2] = (byte)(reason >> 8);
-            packet[3] = (byte)reason;           
+            packet[3] = (byte)reason;
             SendRaw(packet, true);
         }
         
         protected abstract void HandleData(byte[] data, int len);
         
+        /// <summary> Sends data to the underlying socket without wrapping the data in a websocket frame </summary>
         protected abstract void SendRaw(byte[] data, bool sync);
         
         public void Disconnect() { Disconnect(1000); }
diff --git a/MCGalaxy/Player/Player.Login.cs b/MCGalaxy/Player/Player.Login.cs
index 8d3dcbb49..90d7be92e 100644
--- a/MCGalaxy/Player/Player.Login.cs
+++ b/MCGalaxy/Player/Player.Login.cs
@@ -145,9 +145,9 @@ namespace MCGalaxy {
                 Message("Lowlag mode is currently &aON.");
 
             if (String.IsNullOrEmpty(appName)) {
-                Logger.Log(LogType.UserActivity, "{0} [{1}] connected.", name, ip);
+                Logger.Log(LogType.UserActivity, "{0} [{1}] connected.", truename, ip);
             } else {
-                Logger.Log(LogType.UserActivity, "{0} [{1}] connected using {2}.", name, ip, appName);
+                Logger.Log(LogType.UserActivity, "{0} [{1}] connected using {2}.", truename, ip, appName);
             }
             
             PlayerActions.PostSentMap(this, null, level, false);
diff --git a/MCGalaxy/Player/Player.cs b/MCGalaxy/Player/Player.cs
index 0d1fa5d87..5c7819aa1 100644
--- a/MCGalaxy/Player/Player.cs
+++ b/MCGalaxy/Player/Player.cs
@@ -263,7 +263,7 @@ namespace MCGalaxy {
                 
                 if (!loggedIn) {
                     PlayerInfo.Online.Remove(this);
-                    string user = name + " (" + ip + ")";
+                    string user = truename + " (" + ip + ")";
                     Logger.Log(LogType.UserActivity, "{0} disconnected. ({1})", user, discMsg);
                     return;
                 }
@@ -292,11 +292,11 @@ namespace MCGalaxy {
                 if (Server.Config.GuestLeavesNotify || Rank > LevelPermission.Guest) {
                     Chat.MessageFrom(ChatScope.All, this, leaveMsg, null, Chat.FilterVisible(this), !hidden);
                 }
-                Logger.Log(LogType.UserActivity, "{0} disconnected ({1}%S).", name, chatMsg);
+                Logger.Log(LogType.UserActivity, "{0} disconnected ({1}%S).", truename, chatMsg);
             } else {
                 string leaveMsg = "&c- λFULL %Skicked %S" + chatMsg;
                 Chat.MessageFrom(ChatScope.All, this, leaveMsg, null, null, true);
-                Logger.Log(LogType.UserActivity, "{0} kicked ({1}%S).", name, chatMsg);
+                Logger.Log(LogType.UserActivity, "{0} kicked ({1}%S).", truename, chatMsg);
             }
         }