fix double disconnect if trying to connect directly to server

Sonic2423 · Aug 27, 2024 · d4d83c5 · d4d83c5
1 parent 856c6ca
commit d4d83c5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...ain/java/com/sonic2423/neoforwarding/mixin/mixins/ServerLoginPacketListenerImplMixin.java b/...ain/java/com/sonic2423/neoforwarding/mixin/mixins/ServerLoginPacketListenerImplMixin.java
@@ -67,6 +67,8 @@ public void handleHello(ServerboundHelloPacket pPacket, CallbackInfo ci) {
     private void onHandleCustomQueryPacket(ServerboundCustomQueryAnswerPacket packet, CallbackInfo ci) {
         if (Config.enableForwarding && packet.transactionId() == this.neoforwarding$velocityLoginMessageId) {
 
+            ci.cancel();
+
             if (packet.payload() == null) {
                 this.disconnect(Component.literal("This server requires you to connect with Velocity."));
                 return;
@@ -98,8 +100,6 @@ private void onHandleCustomQueryPacket(ServerboundCustomQueryAnswerPacket packet
             startClientVerification(PlayerDataForwarding.createProfile(buf));
 
             NeoForwarding.LOGGER.info("UUID of player {} is {}", this.authenticatedProfile.getName(), this.authenticatedProfile.getId());
-
-            ci.cancel();
         }
     }
 }