fix protocols always mismatching for real

MrNavaStar · Sep 8, 2024 · 77aead2 · 77aead2
1 parent 51cc320
commit 77aead2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/...ain/java/me/mrnavastar/protoweaver/core/protocol/protoweaver/ClientConnectionHandler.java b/...ain/java/me/mrnavastar/protoweaver/core/protocol/protoweaver/ClientConnectionHandler.java
@@ -6,6 +6,7 @@
 import me.mrnavastar.protoweaver.api.netty.ProtoConnection;
 import me.mrnavastar.protoweaver.api.protocol.Protocol;
 import me.mrnavastar.protoweaver.api.protocol.Side;
+import me.mrnavastar.protoweaver.core.util.ProtoConstants;
 
 public class ClientConnectionHandler extends InternalConnectionHandler implements ProtoConnectionHandler {
 
@@ -38,6 +39,10 @@ public void handlePacket(ProtoConnection connection, Object packet) {
                     disconnectIfNeverUpgraded(connection);
                 }
                 case UPGRADE -> {
+                    if (!ProtoConstants.PROTOWEAVER_VERSION.equals(status.getProtoweaverVersion())) {
+                        protocol.logWarn("Connecting with ProtoWeaver version: " + status.getProtoweaverVersion() + ", but server is running: " + ProtoConstants.PROTOWEAVER_VERSION + ". There could be unexpected issues.");
+                    }
+
                     if (!authenticated) return;
                     protocol = ProtoWeaver.getLoadedProtocol(status.getNextProtocol());
                     if (protocol == null) {

diff --git a/common/src/main/java/me/mrnavastar/protoweaver/core/protocol/protoweaver/ProtocolStatus.java b/common/src/main/java/me/mrnavastar/protoweaver/core/protocol/protoweaver/ProtocolStatus.java
@@ -3,6 +3,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
+import me.mrnavastar.protoweaver.core.util.ProtoConstants;
 
 @Getter
 @Setter
@@ -17,6 +18,7 @@ public enum Status {
         UPGRADE
     }
 
+    private final String protoweaverVersion = ProtoConstants.PROTOWEAVER_VERSION;
     private String currentProtocol;
     private String nextProtocol;
     private byte[] nextSHA1;

diff --git a/...ain/java/me/mrnavastar/protoweaver/core/protocol/protoweaver/ServerConnectionHandler.java b/...ain/java/me/mrnavastar/protoweaver/core/protocol/protoweaver/ServerConnectionHandler.java
@@ -8,6 +8,9 @@
 import me.mrnavastar.protoweaver.api.netty.Sender;
 import me.mrnavastar.protoweaver.api.protocol.Protocol;
 import me.mrnavastar.protoweaver.api.protocol.Side;
+import me.mrnavastar.protoweaver.core.util.ProtoConstants;
+
+import java.util.Arrays;
 
 public class ServerConnectionHandler extends InternalConnectionHandler implements ProtoConnectionHandler {
 
@@ -28,13 +31,17 @@ public void handlePacket(ProtoConnection connection, Object packet) {
                         return;
                     }
 
+                    if (!ProtoConstants.PROTOWEAVER_VERSION.equals(status.getProtoweaverVersion())) {
+                        nextProtocol.logWarn("Client connecting with ProtoWeaver version: " + status.getProtoweaverVersion() + ", but server is running: " + ProtoConstants.PROTOWEAVER_VERSION + ". There could be unexpected issues.");
+                    }
+
                     if (nextProtocol.getMaxConnections() != -1 && nextProtocol.getConnections() >= nextProtocol.getMaxConnections()) {
                         status.setStatus(ProtocolStatus.Status.FULL);
                         disconnectIfNeverUpgraded(connection, connection.send(status));
                         return;
                     }
 
-                    if (nextProtocol.getSHA1() != status.getNextSHA1()) {
+                    if (!Arrays.equals(nextProtocol.getSHA1(), status.getNextSHA1())) {
                         nextProtocol.logErr("Mismatch with protocol version on the client!");
                         nextProtocol.logErr("Double check that all packets are registered in the same order and all settings are the same.");