From 4cf271af815b9702c84b209f2bb1ae91c31c573a Mon Sep 17 00:00:00 2001
From: RK_01 <50594595+RaphiMC@users.noreply.github.com>
Date: Thu, 29 Feb 2024 11:11:00 +0100
Subject: [PATCH] Use equals in legacy custom payload channel comparisons
 (#3721)

---
 .../protocol1_11to1_10/packets/InventoryPackets.java |  4 ++--
 .../packets/InventoryPackets.java                    |  4 ++--
 .../packets/InventoryPackets.java                    |  6 +++---
 .../protocol1_9to1_8/packets/PlayerPackets.java      | 12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/packets/InventoryPackets.java
index 0cd567dbd..15bb2f319 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_11to1_10/packets/InventoryPackets.java
@@ -45,7 +45,7 @@ public class InventoryPackets extends ItemRewriter<ClientboundPackets1_9_3, Serv
                 map(Type.STRING); // 0 - Channel
 
                 handler(wrapper -> {
-                    if (wrapper.get(Type.STRING, 0).equalsIgnoreCase("MC|TrList")) {
+                    if (wrapper.get(Type.STRING, 0).equals("MC|TrList")) {
                         wrapper.passthrough(Type.INT); // Passthrough Window ID
 
                         int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
@@ -88,4 +88,4 @@ public class InventoryPackets extends ItemRewriter<ClientboundPackets1_9_3, Serv
         }
         return item;
     }
-}
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/packets/InventoryPackets.java
index 04e55b193..9803e72ae 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/packets/InventoryPackets.java
@@ -47,7 +47,7 @@ public class InventoryPackets extends ItemRewriter<ClientboundPackets1_9_3, Serv
                 map(Type.STRING); // 0 - Channel
 
                 handler(wrapper -> {
-                    if (wrapper.get(Type.STRING, 0).equalsIgnoreCase("MC|TrList")) {
+                    if (wrapper.get(Type.STRING, 0).equals("MC|TrList")) {
                         wrapper.passthrough(Type.INT); // Passthrough Window ID
 
                         int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
@@ -135,4 +135,4 @@ public class InventoryPackets extends ItemRewriter<ClientboundPackets1_9_3, Serv
         }
         return item;
     }
-}
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
index d5cea8d8f..d9a57b60b 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
@@ -99,7 +99,7 @@ public class InventoryPackets extends ItemRewriter<ClientboundPackets1_12_1, Ser
                 handler(wrapper -> {
                     String channel = wrapper.get(Type.STRING, 0);
                     // Handle stopsound change
-                    if (channel.equalsIgnoreCase("MC|StopSound")) {
+                    if (channel.equals("MC|StopSound")) {
                         String originalSource = wrapper.read(Type.STRING);
                         String originalSound = wrapper.read(Type.STRING);
 
@@ -129,7 +129,7 @@ public class InventoryPackets extends ItemRewriter<ClientboundPackets1_12_1, Ser
 
                         wrapper.set(Type.BYTE, 0, flags); // Update flags
                         return;
-                    } else if (channel.equalsIgnoreCase("MC|TrList")) {
+                    } else if (channel.equals("MC|TrList")) {
                         channel = "minecraft:trader_list";
                         wrapper.passthrough(Type.INT); // Passthrough Window ID
 
@@ -773,4 +773,4 @@ public class InventoryPackets extends ItemRewriter<ClientboundPackets1_12_1, Ser
                 || id == 442 // shield
                 || id == 443; // elytra
     }
-}
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/PlayerPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/PlayerPackets.java
index 3270f5092..17a1bd988 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/PlayerPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/PlayerPackets.java
@@ -265,9 +265,9 @@ public class PlayerPackets {
                 map(Type.STRING); // 0 - Channel Name
                 handler(wrapper -> {
                     String name = wrapper.get(Type.STRING, 0);
-                    if (name.equalsIgnoreCase("MC|BOpen")) {
+                    if (name.equals("MC|BOpen")) {
                         wrapper.write(Type.VAR_INT, 0);
-                    } else if (name.equalsIgnoreCase("MC|TrList")) {
+                    } else if (name.equals("MC|TrList")) {
                         wrapper.passthrough(Type.INT); // ID
 
                         Short size = wrapper.passthrough(Type.UNSIGNED_BYTE);
@@ -406,14 +406,14 @@ public class PlayerPackets {
                 map(Type.STRING); // 0 - Channel Name
                 handler(wrapper -> {
                     String name = wrapper.get(Type.STRING, 0);
-                    if (name.equalsIgnoreCase("MC|BSign")) {
+                    if (name.equals("MC|BSign")) {
                         Item item = wrapper.passthrough(Type.ITEM1_8);
                         if (item != null) {
                             item.setIdentifier(387); // Written Book
                             ItemRewriter.rewriteBookToServer(item);
                         }
                     }
-                    if (name.equalsIgnoreCase("MC|AutoCmd")) {
+                    if (name.equals("MC|AutoCmd")) {
                         wrapper.set(Type.STRING, 0, "MC|AdvCdm");
                         wrapper.write(Type.BYTE, (byte) 0);
                         wrapper.passthrough(Type.INT); // X
@@ -423,7 +423,7 @@ public class PlayerPackets {
                         wrapper.passthrough(Type.BOOLEAN); // Flag
                         wrapper.clearInputBuffer();
                     }
-                    if (name.equalsIgnoreCase("MC|AdvCmd")) {
+                    if (name.equals("MC|AdvCmd")) {
                         wrapper.set(Type.STRING, 0, "MC|AdvCdm");
                     }
                 });
@@ -489,4 +489,4 @@ public class PlayerPackets {
             }
         });
     }
-}
+}
\ No newline at end of file