From 6daf4a783f2accd653aa468f7bd8f033966933e9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 May 2020 00:53:57 -0400 Subject: [PATCH] Special case Keep Alive packets from Anti Xray If a server enables Anti Xray, packet sending can be delayed until the chunk has been obfuscated, blocking the entire queue from going out. On a busy server, considering Anti Xray can only operate on a single thread, it is quite possible the obfuscation backlog can get quite behind resulting in a delay of sending packets. And logging in is a clear area where lots of chunks are going to be queued for obfuscation.... We should probably special case a few more than this (such as chat), but this will hopefully help the keep alive issues some people run into. --- .../Allow-Reloading-of-Command-Aliases.patch | 10 +++++- Spigot-Server-Patches/Anti-Xray.patch | 32 +++++++------------ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Spigot-API-Patches/Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/Allow-Reloading-of-Command-Aliases.patch index a3054fd44e..aaab0ef44b 100644 --- a/Spigot-API-Patches/Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-API-Patches/Allow-Reloading-of-Command-Aliases.patch @@ -72,7 +72,7 @@ index adfc7aae2..460fda05a 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java -index c62da4131..af8ab73fe 100644 +index c62da4131..0c7ba0718 100644 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java @@ -0,0 +0,0 @@ public class ReloadCommand extends BukkitCommand { @@ -98,4 +98,12 @@ index c62da4131..af8ab73fe 100644 } else if ("confirm".equalsIgnoreCase(args[0])) { confirmed = true; } else { +@@ -0,0 +0,0 @@ public class ReloadCommand extends BukkitCommand { + @NotNull + @Override + public List tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException { +- return java.util.Collections.singletonList("permissions"); // Paper ++ return com.google.common.collect.Lists.newArrayList("permissions", "commands"); // Paper + } + } -- \ No newline at end of file diff --git a/Spigot-Server-Patches/Anti-Xray.patch b/Spigot-Server-Patches/Anti-Xray.patch index d253c82adc..167176405d 100644 --- a/Spigot-Server-Patches/Anti-Xray.patch +++ b/Spigot-Server-Patches/Anti-Xray.patch @@ -1377,29 +1377,21 @@ index 2c1d1b1a55..44aed67274 100644 if (this.h == this.b) { diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index e156804f7a..96a785af27 100644 +index ddc12364e7..0b6dce35e6 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler> { - return new DefaultEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Local Client IO #%d").setDaemon(true).build()); - }); - private final EnumProtocolDirection h; -- private final Queue packetQueue = Queues.newConcurrentLinkedQueue(); -+ private final Queue packetQueue = Queues.newConcurrentLinkedQueue(); private final Queue getPacketQueue() { return this.packetQueue; } // Paper - OBFHELPER - public Channel channel; - public SocketAddress socketAddress; public void setSpoofedRemoteAddress(SocketAddress address) { this.socketAddress = address; } // Paper - OBFHELPER - // Spigot Start -@@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler> { - } public void sendPacket(Packet packet, @Nullable GenericFutureListener> genericfuturelistener) { -- if (this.isConnected()) { -- this.o(); -+ if (this.isConnected() && this.sendPacketQueue() && !(packet instanceof PacketPlayOutMapChunk && !((PacketPlayOutMapChunk) packet).isReady())) { // Paper - Async-Anti-Xray - Add chunk packets which are not ready or all packets if the packet queue contains chunk packets which are not ready to the packet queue and send the packets later in the right order -+ //this.o(); // Paper - Async-Anti-Xray - Move to if statement (this.sendPacketQueue()) - this.b(packet, genericfuturelistener); - } else { - this.packetQueue.add(new NetworkManager.QueuedPacket(packet, genericfuturelistener)); + // Paper start start - handle oversized packets better ++ // Special case keepalive, allow it to go out of queue order ++ if (packet instanceof PacketPlayOutKeepAlive && this.isConnected()) { ++ this.dispatchPacket(packet, genericfuturelistener); ++ return; ++ } + // write the packets to the queue, then flush - antixray hooks there already + java.util.List extraPackets = buildExtraPackets(packet); + boolean hasExtraPackets = extraPackets != null && !extraPackets.isEmpty(); @@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler> { } @@ -1418,13 +1410,13 @@ index e156804f7a..96a785af27 100644 - while ((networkmanager_queuedpacket = (NetworkManager.QueuedPacket) this.packetQueue.poll()) != null) { - this.b(networkmanager_queuedpacket.a, networkmanager_queuedpacket.b); + while (!this.packetQueue.isEmpty()) { -+ NetworkManager.QueuedPacket networkmanager_queuedpacket = (NetworkManager.QueuedPacket) this.getPacketQueue().peek(); // poll -> peek ++ NetworkManager.QueuedPacket networkmanager_queuedpacket = (NetworkManager.QueuedPacket) queue.peek(); // poll -> peek + + if (networkmanager_queuedpacket != null) { // Fix NPE (Spigot bug caused by handleDisconnection()) + if (networkmanager_queuedpacket.getPacket() instanceof PacketPlayOutMapChunk && !((PacketPlayOutMapChunk) networkmanager_queuedpacket.getPacket()).isReady()) { // Check if the peeked packet is a chunk packet which is not ready + return false; // Return false if the peeked packet is a chunk packet which is not ready + } else { -+ this.getPacketQueue().poll(); // poll here ++ queue.poll(); // poll here + this.dispatchPacket(networkmanager_queuedpacket.getPacket(), networkmanager_queuedpacket.getGenericFutureListener()); // dispatch the packet + } + }