More bugfixes

Wesley1808 · Sep 24, 2023 · b014087 · b014087
1 parent 3e9fb04
commit b014087
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.../src/main/java/com/velocitypowered/proxy/connection/backend/TransitionSessionHandler.java b/.../src/main/java/com/velocitypowered/proxy/connection/backend/TransitionSessionHandler.java
@@ -122,7 +122,7 @@ public boolean handle(JoinGame packet) {
 
               // Change the client to use the ClientPlaySessionHandler if required.
               ClientPlaySessionHandler playHandler;
-              if (player.getConnection().setActiveSessionHandler(StateRegistry.PLAY)) {
+              if (player.getConnection().getActiveSessionHandler() instanceof ClientPlaySessionHandler) {
                 playHandler = (ClientPlaySessionHandler) player.getConnection().getActiveSessionHandler();
               } else {
                 playHandler = new ClientPlaySessionHandler(server, player);

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/AuthSessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/AuthSessionHandler.java
@@ -215,7 +215,7 @@ private void completeLoginProtocolPhaseAndInitialize(ConnectedPlayer player) {
                   return;
                 }
 
-                if (inbound.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_20_2) > 0) {
+                if (inbound.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_20_2) < 0) {
                   mcConnection.setActiveSessionHandler(StateRegistry.PLAY, new InitialConnectSessionHandler(player, server));
                 } else {
                   mcConnection.setActiveSessionHandler(StateRegistry.CONFIG, new ClientConfigSessionHandler(server, player));

diff --git a/...y/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java b/...y/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
@@ -65,6 +65,7 @@
 import com.velocitypowered.proxy.protocol.packet.chat.session.SessionCommandHandler;
 import com.velocitypowered.proxy.protocol.packet.chat.session.SessionPlayerChat;
 import com.velocitypowered.proxy.protocol.packet.chat.session.SessionPlayerCommand;
+import com.velocitypowered.proxy.protocol.packet.config.FinishedUpdate;
 import com.velocitypowered.proxy.protocol.packet.config.StartUpdate;
 import com.velocitypowered.proxy.protocol.packet.title.GenericTitlePacket;
 import com.velocitypowered.proxy.protocol.util.PluginMessageUtil;
@@ -384,7 +385,7 @@ public boolean handle(ResourcePackResponse packet) {
   }
 
   @Override
-  public boolean handle(StartUpdate packet) {
+  public boolean handle(FinishedUpdate packet) {
     //Complete client switch
     player.getConnection().setActiveSessionHandler(StateRegistry.CONFIG);
     configSwitchFuture.complete(null);

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java
@@ -192,7 +192,7 @@ public enum StateRegistry {
           map(0x23, ProtocolVersion.MINECRAFT_1_19, false),
           map(0x24, ProtocolVersion.MINECRAFT_1_19_1, false),
           map(0x27, ProtocolVersion.MINECRAFT_1_20_2, false));
-      serverbound.register(StartUpdate.class, StartUpdate::new,
+      serverbound.register(FinishedUpdate.class, FinishedUpdate::new,
           map(0x0B, ProtocolVersion.MINECRAFT_1_20_2, false));
 
       clientbound.register(BossBar.class, BossBar::new,