Merge pull request 'Update to support Minecraft 1.21.6 version' (#52) from update/1.21.5 into main

Reviewed-on: SteamWar/SteamWar#52
2025-06-30 15:53:44 +02:00
parent 39af920631 23df187eb1
commit 280202c43f
11 changed files with 79 additions and 86 deletions
@@ -44,8 +44,7 @@ public enum ServerVersion {
    PAPER_18("paper-1.18.2.jar", 15, ProtocolVersion.MINECRAFT_1_18_2),
    PAPER_19("paper-1.19.3.jar", 19, ProtocolVersion.MINECRAFT_1_19_3),
    PAPER_20("paper-1.20.1.jar", 20, ProtocolVersion.MINECRAFT_1_20),
-    DEVEL_21("paper-1.21.5.jar", 21, ProtocolVersion.MINECRAFT_1_21_5),
-    PAPER_21("paper-1.21.3.jar", 21, ProtocolVersion.MINECRAFT_1_21_2);
+    PAPER_21("paper-1.21.5.jar", 21, ProtocolVersion.MINECRAFT_1_21_5);

    private static final Map<String, ServerVersion> chatMap = new HashMap<>();

@@ -95,10 +94,6 @@ public enum ServerVersion {
    }

    public static ServerVersion get(int version) {
-        if (version == 21) {
-            return DEVEL_21;
-        }
-
        return versionMap.get(version);
    }

@@ -148,6 +148,11 @@ public class Tablist extends ChannelInboundHandlerAdapter {
                current.clear();
            }

+            if (player.getProtocolVersion().noLessThan(ProtocolVersion.MINECRAFT_1_21_5)) {
+                // TODO: Misformed Packet?
+                return;
+            }
+
            sendPacket(player, createTeamPacket);
        }
    }