From 487bc24a8a9b1a7a81bb73c2e2f1111a15084e41 Mon Sep 17 00:00:00 2001
From: games647 <games647@users.noreply.github.com>
Date: Thu, 30 Mar 2023 17:25:46 +0200
Subject: [PATCH] Fix breaking ProtocolLib Minecraft version change

Fixes #1008
---
 .../bukkit/listener/protocollib/ProtocolLibListener.java    | 6 +++---
 .../bukkit/listener/protocollib/VerifyResponseTask.java     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java
index 122f5027..c198552a 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java
@@ -179,8 +179,8 @@ public class ProtocolLibListener extends PacketAdapter {
     private boolean verifyNonce(Player sender, PacketContainer packet,
                                 ClientPublicKey clientPublicKey, byte[] expectedToken) {
         try {
-            if (MinecraftVersion.atOrAbove(new MinecraftVersion(1, 19, 0))
-                    && !MinecraftVersion.atOrAbove(new MinecraftVersion(1, 19, 3))) {
+            if (new MinecraftVersion(1, 19, 0).atOrAbove()
+                    && !(new MinecraftVersion(1, 19, 3).atOrAbove())) {
                 Either<byte[], ?> either = packet.getSpecificModifier(Either.class).read(0);
                 if (clientPublicKey == null) {
                     Optional<byte[]> left = either.left();
@@ -224,7 +224,7 @@ public class ProtocolLibListener extends PacketAdapter {
 
         PacketContainer packet = packetEvent.getPacket();
         Optional<ClientPublicKey> clientKey = Optional.empty();
-        if (MinecraftVersion.atOrAbove(new MinecraftVersion(1, 19, 3))) {
+        if (new MinecraftVersion(1, 19, 3).atOrAbove()) {
             // public key sent separate
             clientKey = Optional.empty();
         } else {
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTask.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTask.java
index 50242186..387f04dd 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTask.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTask.java
@@ -272,7 +272,7 @@ public class VerifyResponseTask implements Runnable {
     //fake a new login packet in order to let the server handle all the other stuff
     private void receiveFakeStartPacket(String username, ClientPublicKey clientKey) {
         PacketContainer startPacket;
-        if (MinecraftVersion.atOrAbove(new MinecraftVersion(1, 19, 0))) {
+        if (new MinecraftVersion(1, 19, 0).atOrAbove()) {
             startPacket = new PacketContainer(START);
             startPacket.getStrings().write(0, username);