From 122ceb8d1e39e5b657c92470a288c43845dbc161 Mon Sep 17 00:00:00 2001
From: RaphiMC <50594595+RaphiMC@users.noreply.github.com>
Date: Sat, 26 Aug 2023 01:11:10 +0200
Subject: [PATCH] Fixed LegacyProtocolVersion returning wrong ids when
 protocols overlap

---
 .../net/raphimc/vialegacy/api/LegacyProtocolVersion.java  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/raphimc/vialegacy/api/LegacyProtocolVersion.java b/src/main/java/net/raphimc/vialegacy/api/LegacyProtocolVersion.java
index 084ac9f..db659c3 100644
--- a/src/main/java/net/raphimc/vialegacy/api/LegacyProtocolVersion.java
+++ b/src/main/java/net/raphimc/vialegacy/api/LegacyProtocolVersion.java
@@ -75,10 +75,8 @@ public class LegacyProtocolVersion {
             return a - b;
         }
         // Both are legacy
-        a = -a;
-        b = -b;
-        final int baseProtocolA = a >> 2;
-        final int baseProtocolB = b >> 2;
+        final int baseProtocolA = getRealProtocolVersion(a);
+        final int baseProtocolB = getRealProtocolVersion(b);
         if (baseProtocolA != baseProtocolB) {
             return baseProtocolA - baseProtocolB;
         }
@@ -93,7 +91,7 @@ public class LegacyProtocolVersion {
             return protocolVersion;
         }
 
-        return -protocolVersion >> 2;
+        return -(protocolVersion >> 2);
     }