From 902e944cbbb64612d4a4ae563b04ae6cc8f335b9 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 24 Mar 2026 00:23:31 +0000 Subject: [PATCH] Modernize null-check patterns in Protocol18.cs Replace '== null' with 'is null' and '!= null' with 'is not null' for all 25 null comparisons in the file, following modern C# pattern matching conventions. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../Protocol/Handlers/Protocol18.cs | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs index a11efc1e..73ce0f78 100644 --- a/MinecraftClient/Protocol/Handlers/Protocol18.cs +++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs @@ -133,7 +133,7 @@ namespace MinecraftClient.Protocol.Handlers this.handler = handler; pForge = new Protocol18Forge(forgeInfo, protocolVersion, dataTypes, this, handler); pTerrain = new Protocol18Terrain(protocolVersion, dataTypes, handler); - packetPalette = new PacketTypeHandler(protocolVersion, forgeInfo != null).GetTypeHandler(); + packetPalette = new PacketTypeHandler(protocolVersion, forgeInfo is not null).GetTypeHandler(); log = handler.GetLogger(); randomGen = RandomNumberGenerator.Create(); lastSeenMessagesCollector = protocolVersion >= MC_1_19_3_Version ? new(20) : new(5); @@ -524,7 +524,7 @@ namespace MinecraftClient.Protocol.Handlers else if (isDimension) { dimensionIdMap!.Add(i, entryId); - if (nbtData != null && handler.GetTerrainEnabled()) + if (nbtData is not null && handler.GetTerrainEnabled()) World.StoreOneDimension(entryId, nbtData); } else if (isAttribute) @@ -984,7 +984,7 @@ namespace MinecraftClient.Protocol.Handlers else { var player = handler.GetPlayerInfo(senderUuid); - verifyResult = player != null && player.VerifyMessage(signedChat, timestamp, salt, + verifyResult = player is not null && player.VerifyMessage(signedChat, timestamp, salt, ref messageSignature); } @@ -1043,7 +1043,7 @@ namespace MinecraftClient.Protocol.Handlers var messageTypeEnum = ChatParser.ChatId2Type!.GetValueOrDefault(chatTypeId, ChatParser.MessageType.CHAT); - if (targetName != null && + if (targetName is not null && (messageTypeEnum == ChatParser.MessageType.TEAM_MSG_COMMAND_INCOMING || messageTypeEnum == ChatParser.MessageType.TEAM_MSG_COMMAND_OUTGOING)) senderTeamName = Json.ParseJson(targetName)!["with"]![0]! @@ -1052,7 +1052,7 @@ namespace MinecraftClient.Protocol.Handlers if (string.IsNullOrWhiteSpace(senderDisplayName)) { var player = handler.GetPlayerInfo(senderUuid); - if (player != null && (player.DisplayName != null || player is { Name: not null }) && + if (player is not null && (player.DisplayName is not null || player is { Name: not null }) && string.IsNullOrWhiteSpace(senderDisplayName)) { senderDisplayName = ChatParser.ParseText(player.DisplayName ?? player.Name); @@ -1071,7 +1071,7 @@ namespace MinecraftClient.Protocol.Handlers else { var player = handler.GetPlayerInfo(senderUuid); - if (player == null || !player.IsMessageChainLegal()) + if (player is null || !player.IsMessageChainLegal()) verifyResult = false; else { @@ -1158,7 +1158,7 @@ namespace MinecraftClient.Protocol.Handlers if (string.IsNullOrWhiteSpace(senderDisplayName)) { var player = handler.GetPlayerInfo(senderUuid); - if (player != null && (player.DisplayName != null || player.Name != null) && + if (player is not null && (player.DisplayName is not null || player.Name is not null) && string.IsNullOrWhiteSpace(senderDisplayName)) { senderDisplayName = player.DisplayName ?? player.Name; @@ -1170,7 +1170,7 @@ namespace MinecraftClient.Protocol.Handlers } bool verifyResult; - if (!isOnlineMode || messageSignature == null) + if (!isOnlineMode || messageSignature is null) verifyResult = false; else { @@ -1179,7 +1179,7 @@ namespace MinecraftClient.Protocol.Handlers else { var player = handler.GetPlayerInfo(senderUuid); - if (player == null || !player.IsMessageChainLegal()) + if (player is null || !player.IsMessageChainLegal()) verifyResult = false; else { @@ -1336,7 +1336,7 @@ namespace MinecraftClient.Protocol.Handlers { var player = handler.GetPlayerInfo(senderUuid); - if (player == null || !player.IsMessageChainLegal()) + if (player is null || !player.IsMessageChainLegal()) verifyResult = false; else { @@ -2017,7 +2017,7 @@ namespace MinecraftClient.Protocol.Handlers // Warning: It is legal to include unloaded chunks in the UnloadChunk packet. // Since chunks that have not been loaded are not recorded, this may result // in loading chunks that should be unloaded and inaccurate statistics. - if (handler.GetWorld()[chunkX, chunkZ] != null) + if (handler.GetWorld()[chunkX, chunkZ] is not null) Interlocked.Decrement(ref handler.GetWorld().chunkCnt); handler.GetWorld()[chunkX, chunkZ] = null; @@ -2061,7 +2061,7 @@ namespace MinecraftClient.Protocol.Handlers else { var playerGet = handler.GetPlayerInfo(playerUuid); - if (playerGet == null) + if (playerGet is null) { player = new(string.Empty, playerUuid); handler.OnPlayerJoin(player); @@ -2221,7 +2221,7 @@ namespace MinecraftClient.Protocol.Handlers if (dataTypes.ReadNextBool(packetData)) { var player = handler.GetPlayerInfo(uuid); - if (player != null) + if (player is not null) player.DisplayName = dataTypes.ReadNextString(packetData); else dataTypes.SkipNextString(packetData); @@ -2365,7 +2365,7 @@ namespace MinecraftClient.Protocol.Handlers for (var slotId = 0; slotId < elements; slotId++) { var item = dataTypes.ReadNextItemSlot(packetData, itemPalette); - if (item != null) + if (item is not null) inventorySlots[slotId] = item; } @@ -3109,7 +3109,7 @@ namespace MinecraftClient.Protocol.Handlers /// Net read thread ID public int GetNetMainThreadId() { - return netMain != null ? netMain.Item1.ManagedThreadId : -1; + return netMain is not null ? netMain.Item1.ManagedThreadId : -1; } /// @@ -3119,12 +3119,12 @@ namespace MinecraftClient.Protocol.Handlers { try { - if (netMain != null) + if (netMain is not null) { netMain.Item2.Cancel(); } - if (netReader != null) + if (netReader is not null) { netReader.Item2.Cancel(); socketWrapper.Disconnect(); @@ -3212,7 +3212,7 @@ namespace MinecraftClient.Protocol.Handlers // 1.19 - 1.19.2 if (protocolVersion is >= MC_1_19_Version and < MC_1_19_3_Version) { - if (playerKeyPair == null) + if (playerKeyPair is null) fullLoginPacket.AddRange(dataTypes.GetBool(false)); // Has Sig Data else { @@ -3371,7 +3371,7 @@ namespace MinecraftClient.Protocol.Handlers // 1.19 - 1.19.2 if (protocolVersion is >= MC_1_19_Version and < MC_1_19_3_Version) { - if (playerKeyPair == null) + if (playerKeyPair is null) { encryptionResponse.AddRange(dataTypes.GetBool(true)); // Has Verify Token encryptionResponse.AddRange(dataTypes.GetArray(RSAService.Encrypt(token, false))); // Verify Token @@ -3622,7 +3622,7 @@ namespace MinecraftClient.Protocol.Handlers } ConsoleIO.WriteLineFormatted("ยง8" + string.Format(Translations.mcc_server_protocol, version, - protocolVersion + (forgeInfo != null ? Translations.mcc_with_forge : ""))); + protocolVersion + (forgeInfo is not null ? Translations.mcc_with_forge : ""))); return true; } @@ -3719,7 +3719,7 @@ namespace MinecraftClient.Protocol.Handlers public void Acknowledge(ChatMessage message) { var entry = message.ToLastSeenMessageEntry(); - if (entry == null) return; + if (entry is null) return; if (protocolVersion >= MC_1_19_3_Version) { @@ -3768,7 +3768,7 @@ namespace MinecraftClient.Protocol.Handlers List>? needSigned = null; bool canSignCommand = protocolVersion >= MC_1_19_Version && isOnlineMode && - playerKeyPair != null && + playerKeyPair is not null && Config.Signature.LoginWithSecureProfile && Config.Signature.SignMessageInCommand; @@ -3798,7 +3798,7 @@ namespace MinecraftClient.Protocol.Handlers var timeNow = DateTimeOffset.UtcNow; fields.AddRange(DataTypes.GetLong(timeNow.ToUnixTimeMilliseconds())); - if (needSigned == null || needSigned.Count == 0) + if (needSigned is null || needSigned.Count == 0) { fields.AddRange(DataTypes.GetLong(0)); fields.AddRange(DataTypes.GetVarInt(0)); @@ -3902,7 +3902,7 @@ namespace MinecraftClient.Protocol.Handlers var timeNow = DateTimeOffset.UtcNow; fields.AddRange(DataTypes.GetLong(timeNow.ToUnixTimeMilliseconds())); - if (!isOnlineMode || playerKeyPair == null || !Config.Signature.LoginWithSecureProfile || + if (!isOnlineMode || playerKeyPair is null || !Config.Signature.LoginWithSecureProfile || !Config.Signature.SignChat) { fields.AddRange(DataTypes.GetLong(0)); // Salt: Long @@ -5105,7 +5105,7 @@ namespace MinecraftClient.Protocol.Handlers public bool SendPlayerSession(PlayerKeyPair? playerKeyPair) { - if (playerKeyPair == null || !isOnlineMode) + if (playerKeyPair is null || !isOnlineMode) return false; if (protocolVersion >= MC_1_19_3_Version)