Merge branch 'PaperMC:dev/3.0.0' into dev/3.0.0

api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java

@@ -86,7 +86,7 @@ public enum ProtocolVersion implements Ordered<ProtocolVersion> {
   MINECRAFT_1_20(763, "1.20", "1.20.1"),
   MINECRAFT_1_20_2(764, "1.20.2"),
   MINECRAFT_1_20_3(765, "1.20.3", "1.20.4"),
-  MINECRAFT_1_20_5(766, "1.20.5");
+  MINECRAFT_1_20_5(766, "1.20.5", "1.20.6");
 
   private static final int SNAPSHOT_BIT = 30;
 

proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java

@@ -195,8 +195,9 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
           boolean isQuietDecoderException = cause instanceof QuietDecoderException;
           boolean willLog = !isQuietDecoderException && !frontlineHandler;
           if (willLog) {
-            logger.error("{}: exception encountered in {}", association, activeSessionHandler,
-                cause);
+            logger.atError().withThrowable(cause)
+                .log("{}: exception encountered in {}", association,
+                    activeSessionHandler);
           } else {
             knownDisconnect = true;
           }
@@ -226,7 +227,6 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
    * Writes and immediately flushes a message to the connection.
    *
    * @param msg the message to write
-   *
    * @return A {@link ChannelFuture} that will complete when packet is successfully sent
    */
   @Nullable
@@ -370,12 +370,12 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
     this.state = state;
     // If the connection is LEGACY (<1.6), the decoder and encoder are not set.
     final MinecraftEncoder minecraftEncoder = this.channel.pipeline()
-            .get(MinecraftEncoder.class);
+        .get(MinecraftEncoder.class);
     if (minecraftEncoder != null) {
       minecraftEncoder.setState(state);
     }
     final MinecraftDecoder minecraftDecoder = this.channel.pipeline()
-            .get(MinecraftDecoder.class);
+        .get(MinecraftDecoder.class);
     if (minecraftDecoder != null) {
       minecraftDecoder.setState(state);
     }
@@ -395,8 +395,8 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
   public void addPlayPacketQueueHandler() {
     if (this.channel.pipeline().get(Connections.PLAY_PACKET_QUEUE) == null) {
       this.channel.pipeline().addAfter(Connections.MINECRAFT_ENCODER, Connections.PLAY_PACKET_QUEUE,
-           new PlayPacketQueueHandler(this.protocolVersion,
-                channel.pipeline().get(MinecraftEncoder.class).getDirection()));
+          new PlayPacketQueueHandler(this.protocolVersion,
+              channel.pipeline().get(MinecraftEncoder.class).getDirection()));
     }
   }
 

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/chat/session/SessionCommandHandler.java

@@ -55,7 +55,7 @@ public class SessionCommandHandler implements CommandHandler<SessionPlayerComman
                   + "Contact your network administrator."));
         }
         // We seemingly can't actually do this if signed args exist, if not, we can probs keep stuff happy
-        if (player.getProtocolVersion().noLessThan(ProtocolVersion.MINECRAFT_1_19_3)) {
+        if (player.getProtocolVersion().noLessThan(ProtocolVersion.MINECRAFT_1_19_3) && packet.lastSeenMessages != null) {
           return CompletableFuture.completedFuture(new ChatAcknowledgementPacket(packet.lastSeenMessages.getOffset()));
         }
         return CompletableFuture.completedFuture(null);

proxy/src/main/java/com/velocitypowered/proxy/tablist/VelocityTabList.java

@@ -166,7 +166,9 @@ public class VelocityTabList implements InternalTabList {
       return entry;
     });
 
-    this.connection.write(new UpsertPlayerInfoPacket(actions, List.of(playerInfoEntry)));
+    if (!actions.isEmpty()) {
+      this.connection.write(new UpsertPlayerInfoPacket(actions, List.of(playerInfoEntry)));
+    }
   }
 
   @Override