Fixed sending empty messages

PULSAR-Modders · Apr 29, 2021 · d901d41 · d901d41
1 parent db6a460
commit d901d41
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/PulsarPluginLoader/Chat/Extensions/HarmonyNetworkUpdate.cs b/PulsarPluginLoader/Chat/Extensions/HarmonyNetworkUpdate.cs
@@ -59,7 +59,7 @@ static void Prefix(PLNetworkManager __instance)
                             }
                         }
                     }
-                    else if (c == Environment.NewLine[0] || c == "\r"[0])
+                    else if (c == '\n' || c == '\r')
                     {
                         //Do nothing
                     }

diff --git a/PulsarPluginLoader/Chat/Extensions/HarmonyProcessCurrentChatText.cs b/PulsarPluginLoader/Chat/Extensions/HarmonyProcessCurrentChatText.cs
@@ -9,17 +9,19 @@ class HarmonyProcessCurrentChatText
         private static readonly char[] newline = { '\n', '\r' };
         static void Prefix(PLNetworkManager __instance)
         {
+            __instance.CurrentChatText = __instance.CurrentChatText.TrimEnd(newline);
+
             if (string.IsNullOrWhiteSpace(__instance.CurrentChatText))
             {
                 return;
             }
 
-            LinkedListNode<string> lastMessage = ChatHelper.chatHistory.FindLast(__instance.CurrentChatText.TrimEnd(newline));
+            LinkedListNode<string> lastMessage = ChatHelper.chatHistory.FindLast(__instance.CurrentChatText);
             if (lastMessage != null)
             {
                 ChatHelper.chatHistory.Remove(lastMessage);
             }
-            ChatHelper.chatHistory.AddLast(__instance.CurrentChatText.TrimEnd(newline));
+            ChatHelper.chatHistory.AddLast(__instance.CurrentChatText);
             if (ChatHelper.chatHistory.Count > 100)
             {
                 ChatHelper.chatHistory.RemoveFirst();