diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index b9ed64397c..076415678f 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -484,7 +484,6 @@ internal bool HandlePacket(int packetId, Queue packetData) private bool HandlePlayPackets(int packetId, Queue packetData) { - try{ switch (packetPalette.GetIncommingTypeById(packetId)) { case PacketTypesIn.KeepAlive: // Keep Alive (Play) @@ -797,9 +796,10 @@ private bool HandlePlayPackets(int packetId, Queue packetData) : null; var chatInfo = Json.ParseJson(chatName).Properties; - var senderDisplayName = - (chatInfo.ContainsKey("insertion") ? chatInfo["insertion"] : (chatInfo.ContainsKey("text") ? chatInfo["text"] : "")) - .StringValue; + var senderDisplayName = chatInfo != null && chatInfo.Count > 0 + ? (chatInfo.ContainsKey("insertion") ? chatInfo["insertion"] : chatInfo["text"]) + .StringValue + : ""; string? senderTeamName = null; var messageTypeEnum = ChatParser.ChatId2Type!.GetValueOrDefault(chatTypeId, ChatParser.MessageType.CHAT); @@ -909,12 +909,14 @@ private bool HandlePlayPackets(int packetId, Queue packetData) var chatInfo = Json.ParseJson(targetName ?? chatName).Properties; - var senderDisplayName = - (chatInfo.ContainsKey("insertion") ? chatInfo["insertion"] : (chatInfo.ContainsKey("text") ? chatInfo["text"] : "")) - .StringValue; + var senderDisplayName = chatInfo != null && chatInfo.Count > 0 + ? (chatInfo.ContainsKey("insertion") ? chatInfo["insertion"] : chatInfo["text"]) + .StringValue + : ""; string? senderTeamName = null; if (targetName != null && - messageTypeEnum is ChatParser.MessageType.TEAM_MSG_COMMAND_INCOMING or ChatParser.MessageType.TEAM_MSG_COMMAND_OUTGOING) + messageTypeEnum is ChatParser.MessageType.TEAM_MSG_COMMAND_INCOMING + or ChatParser.MessageType.TEAM_MSG_COMMAND_OUTGOING) senderTeamName = Json.ParseJson(targetName).Properties["with"].DataArray[0] .Properties["text"].StringValue; @@ -2571,9 +2573,6 @@ private bool HandlePlayPackets(int packetId, Queue packetData) } return true; //Packet processed - }catch(Exception exception){ - exception.printStackTrace(); - } } ///