Fixes patch conflict with Anti-Xray - Close GH-158

patches/api/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From fdf164a1b0a70f9a0dc56bd363637a894814145a Mon Sep 17 00:00:00 2001
+From 88c462e64d3468d0ad87e6f8271e4e434a8f06d1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Fri, 14 Dec 2018 21:52:29 -0800

patches/api/0002-Add-server-configuration.patch

@@ -1,4 +1,4 @@
-From 5a32a7baf818149553c639e88f3ee451a14ca4c6 Mon Sep 17 00:00:00 2001
+From 0fc740d0df7c774c0ad30c4c35f9e42104fec802 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Fri, 3 Apr 2020 15:18:38 +0800

patches/server/0001-Fix-errors-on-editors-and-add-ignores.patch

@@ -1,4 +1,4 @@
-From 5d8b21db725f0384be1a1c87e29d3b1d80d0c48e Mon Sep 17 00:00:00 2001
+From 8505e57f361d6996f04d62cda5d4e7abfa21c477 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 00:52:56 +0700
 Subject: [PATCH] Fix errors on editors and add ignores

patches/server/0002-Akarin-POM-changes.patch

@@ -1,4 +1,4 @@
-From fa496fcaa75f52cf5c014c2be32258bf5ed09248 Mon Sep 17 00:00:00 2001
+From 9d54a44af2e2a6263bdb8148cc57a14789f955f3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Fri, 14 Dec 2018 21:53:58 -0800

patches/server/0003-Akarin-configuration.patch

@@ -1,4 +1,4 @@
-From f37a682eebccac39f0ce89dcb43c9f87a80affea Mon Sep 17 00:00:00 2001
+From af45e8fbc44d0d72619b5b7b9596587aa7b8026f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Fri, 3 Apr 2020 14:59:22 +0800

patches/server/0004-Akarin-brand-changes.patch

@@ -1,4 +1,4 @@
-From 868590b212275cc01b1e64f216e81a485c69e86a Mon Sep 17 00:00:00 2001
+From 55081a981c3d77acb0064c456ba4235b6d317285 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Tue, 18 Dec 2018 06:27:02 -0800

patches/server/0005-Akarin-Metrics.patch

@@ -1,4 +1,4 @@
-From ab692ebe1e8f0c01c164c0bf6c9cf78a953102e6 Mon Sep 17 00:00:00 2001
+From 5cd3b220a579a05bb64dd9140f0d237b290d01db Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Mon, 13 Apr 2020 13:18:27 +0800

patches/server/0006-Disable-the-Snooper.patch

@@ -1,4 +1,4 @@
-From 984f3d6eaf05d6e072d57a7c8506132e354a3915 Mon Sep 17 00:00:00 2001
+From 5463d79e92c4b8aa8161b93f89272e088f42e633 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 22:17:18 +0700
 Subject: [PATCH] Disable the Snooper

patches/server/0007-Avoid-double-I-O-operation-on-load-player-file.patch

@@ -1,4 +1,4 @@
-From c91e028a222ebd9a8af02c6d49278a8148f27750 Mon Sep 17 00:00:00 2001
+From 234ebaa54d6fdab2c7209218014b5d16af1ee605 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:29:08 +0800

patches/server/0008-Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch

@@ -1,4 +1,4 @@
-From 3148f17301d4566782712d11493e4bac5af13b09 Mon Sep 17 00:00:00 2001
+From 02f4e13d761859a8c6c657446e984c0d5d41bf0f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:43:20 +0800

patches/server/0009-Never-drop-items-on-command-give.patch

@@ -1,4 +1,4 @@
-From bf2ec65d61c2633c8696fb24ca866bf0c271e147 Mon Sep 17 00:00:00 2001
+From 248e7b359bcf81957b4310939b177307b74e2e49 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:35:19 +0800

patches/server/0010-Save-Json-list-asynchronously.patch

@@ -1,4 +1,4 @@
-From a6a58b1cf9a25ab78cf00bca9ab050dfe9d41397 Mon Sep 17 00:00:00 2001
+From 9858a4f599533da9ebc2befca0d03d07f888f072 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Thu, 2 Apr 2020 11:16:18 +0800

patches/server/0011-Remove-vanilla-profiler-callers.patch

@@ -1,4 +1,4 @@
-From ca5f28349f85a068161a35c7e69bb3246258b3ad Mon Sep 17 00:00:00 2001
+From ac3292dd04ee6ac5994bba66ae6f385f58c48047 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 22:18:01 +0700
 Subject: [PATCH] Remove vanilla profiler callers

patches/server/0012-Asynchronous-pathfinding.patch

@@ -1,4 +1,4 @@
-From 30738f8b0d7113418335b1e1cf760993ac495af1 Mon Sep 17 00:00:00 2001
+From e98f19cf20bcb5afe46e8d1ece74c79e3bf4f41a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Sun, 5 Apr 2020 13:01:13 +0800

patches/server/0013-Optimizations-for-network.patch

@@ -1,4 +1,4 @@
-From df50e4a222bdb9e05540ded0cd4b234bfb928346 Mon Sep 17 00:00:00 2001
+From 2586ac1cc5a0b940aa0b46721383c28e615e0dab Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Sun, 5 Apr 2020 14:59:10 +0800
@@ -106,19 +106,18 @@ index f1222fcb2b..522cfed4cb 100644
  
      protected GameProfile a(GameProfile gameprofile) {
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 96a785af27..c5e32e4246 100644
+index 96a785af27..f2a31f5923 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
-@@ -43,6 +43,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -43,6 +43,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
      });
      private final EnumProtocolDirection h;
      private final Queue<NetworkManager.QueuedPacket> packetQueue = Queues.newConcurrentLinkedQueue(); private final Queue<NetworkManager.QueuedPacket> getPacketQueue() { return this.packetQueue; } // Paper - OBFHELPER
-+    private boolean handled = false; // Akarin - free packet queue
 +    private EnumProtocol protocol; // Akarin - avoid map lookup
      public Channel channel;
      public SocketAddress socketAddress; public void setSpoofedRemoteAddress(SocketAddress address) { this.socketAddress = address; } // Paper - OBFHELPER
      // Spigot Start
-@@ -88,6 +90,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -88,6 +89,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
  
      public void setProtocol(EnumProtocol enumprotocol) {
          this.channel.attr(NetworkManager.c).set(enumprotocol);
@@ -126,7 +125,7 @@ index 96a785af27..c5e32e4246 100644
          this.channel.config().setAutoRead(true);
          NetworkManager.LOGGER.debug("Enabled auto read");
      }
-@@ -175,8 +178,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -175,8 +177,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
  
      private void dispatchPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericFutureListener) { this.b(packet, genericFutureListener); } // Paper - OBFHELPER
      private void b(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericfuturelistener) {
@@ -137,7 +136,7 @@ index 96a785af27..c5e32e4246 100644
  
          ++this.q;
          if (enumprotocol1 != enumprotocol) {
-@@ -184,7 +187,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -184,7 +186,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
              this.channel.config().setAutoRead(false);
          }
  
@@ -146,15 +145,35 @@ index 96a785af27..c5e32e4246 100644
              if (enumprotocol != enumprotocol1) {
                  this.setProtocol(enumprotocol);
              }
-@@ -223,9 +226,51 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -223,30 +225,71 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
  
      }
  
+-    // Paper start - Async-Anti-Xray - Stop dispatching further packets and return false if the peeked packet is a chunk packet which is not ready
+-    private boolean sendPacketQueue() { return this.o(); } // OBFHELPER // void -> boolean
+-    private boolean o() { // void -> boolean
+-        if (this.channel != null && this.channel.isOpen()) {
+-            Queue queue = this.packetQueue;
+-
+-            synchronized (this.packetQueue) {
+-                while (!this.packetQueue.isEmpty()) {
+-                    NetworkManager.QueuedPacket networkmanager_queuedpacket = (NetworkManager.QueuedPacket) this.getPacketQueue().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
+-                            this.dispatchPacket(networkmanager_queuedpacket.getPacket(), networkmanager_queuedpacket.getGenericFutureListener()); // dispatch the packet
+-                        }
+-                    }
+-                }
 +    // Akarin Start - Async Sending packets - multiple packets, copied from above
 +    public void sendPacketAsync(Packet<?> packet) {
 +        EnumProtocol enumprotocol = packet.protocol();
 +        EnumProtocol enumprotocol1 = protocol;
-+
+ 
+-            }
 +        ++this.q;
 +        if (enumprotocol1 != enumprotocol) {
 +            NetworkManager.LOGGER.debug("Disabled auto read");
@@ -175,8 +194,9 @@ index 96a785af27..c5e32e4246 100644
 +        if (protocol != enumprotocol) {
 +            NetworkManager.LOGGER.debug("Disabled auto read");
 +            this.channel.config().setAutoRead(false);
-+        }
+         }
-+
+ 
+-        return true; // Return true if all packets were dispatched
 +        this.channel.eventLoop().execute(() -> {
 +            if (enumprotocol != protocol) {
 +                this.setProtocol(enumprotocol);
@@ -191,23 +211,34 @@ index 96a785af27..c5e32e4246 100644
 +    }
 +    // Akarin End
 +
-     // Paper start - Async-Anti-Xray - Stop dispatching further packets and return false if the peeked packet is a chunk packet which is not ready
++    // Paper start - Async-Anti-Xray - Stop dispatching further packets and return false if the peeked packet is a chunk packet which is not ready
-     private boolean sendPacketQueue() { return this.o(); } // OBFHELPER // void -> boolean
++    private boolean sendPacketQueue() { return this.o(); } // OBFHELPER // void -> boolean
-     private boolean o() { // void -> boolean
++    private boolean o() { // void -> boolean
-+        if (!handled) { // Akarin  - free packet queue
++      if (this.channel != null && this.channel.isOpen()) {
-         if (this.channel != null && this.channel.isOpen()) {
++          Queue queue = this.packetQueue;
-             Queue queue = this.packetQueue;
++
- 
++          synchronized (this.packetQueue) {
-@@ -245,6 +290,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
++              while (!this.packetQueue.isEmpty()) {
- 
++                  NetworkManager.QueuedPacket networkmanager_queuedpacket = (NetworkManager.QueuedPacket) this.getPacketQueue().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
++                          this.dispatchPacket(networkmanager_queuedpacket.getPacket(), networkmanager_queuedpacket.getGenericFutureListener()); // dispatch the packet
++                      }
++                  }
++              }
++
++          }
++      }
++
++      return true; // Return true if all packets were dispatched
      }
-         }
+     // Paper end
-+        handled = true; // Akarin  - free packet queue
-+        } // Akarin  - free packet queue
  
-         return true; // Return true if all packets were dispatched
+@@ -260,9 +303,9 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
-     }
-@@ -260,9 +307,9 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
              ((PlayerConnection) this.packetListener).tick();
          }
  

patches/server/0014-Swaps-the-predicate-order-of-collision.patch

@@ -1,4 +1,4 @@
-From e56809d3744900d2ce7713bd85fa27c579012fe2 Mon Sep 17 00:00:00 2001
+From 68179ee6442dc582e64a3501badb23979d2a04b4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E3=84=97=E3=84=A0=CB=8B=20=E3=84=91=E3=84=A7=CB=8A?=
  <tsao-chi@the-lingo.org>
 Date: Fri, 10 Apr 2020 15:47:15 +0800

patches/server/0015-Tuinity-Use-ArrayDeque-for-pendingChunkUpdates-in-Ch.patch

@@ -1,4 +1,4 @@
-From 288f2d57f03c7df5db25dfb5d8bcc2854fe4ccec Mon Sep 17 00:00:00 2001
+From e938a20dc137376d5f46fa6f1d70e556f1564cf8 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 02:39:12 +0700
 Subject: [PATCH] Tuinity Use ArrayDeque for pendingChunkUpdates in

patches/server/0016-Tuinity-Optimise-ArraySetSorted-removeIf.patch

@@ -1,4 +1,4 @@
-From d97f27a2084582eab975e002242f7bceb095ba4c Mon Sep 17 00:00:00 2001
+From 66108ad190cd38d84f63acf6a0fcf9274328cea8 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 02:44:07 +0700
 Subject: [PATCH] Tuinity Optimise ArraySetSorted#removeIf

patches/server/0017-Don-t-run-entity-collision-code-if-not-needed.patch

@@ -1,4 +1,4 @@
-From 8d0da081e7bad951b56e04ddfced912e249fa013 Mon Sep 17 00:00:00 2001
+From 15199cd32e2b5652cb7327a0023ffeedd691bcf4 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 02:49:56 +0700
 Subject: [PATCH] Don't run entity collision code if not needed

patches/server/0018-Optimize-door-interact-with-pathfinding.patch

@@ -1,4 +1,4 @@
-From c959fdcaf470d05e81517b7260c02659c3e4073b Mon Sep 17 00:00:00 2001
+From b18cd3ce6068d169e62857776818a959edba0b7b Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 03:51:50 +0700
 Subject: [PATCH] Optimize door interact with pathfinding

patches/server/0019-Remove-stream-for-ender-teleport.patch

@@ -1,4 +1,4 @@
-From 682855a87bed94aed02a2e045060798cec7d2dfe Mon Sep 17 00:00:00 2001
+From 6476031ecb6212b4642a7676bb229a1c8f0bbc89 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 04:16:44 +0700
 Subject: [PATCH] Remove stream for ender teleport

patches/server/0020-Cache-Hashcode-for-BlockPosition.patch

@@ -1,4 +1,4 @@
-From 754e622d4aebdb21a62c61f83f7d0bfa9c2453f3 Mon Sep 17 00:00:00 2001
+From 6a4f18dea28f631dfacb16e988d6ada5ba270ad1 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 04:28:25 +0700
 Subject: [PATCH] Cache hashcode for BlockPosition

patches/server/0021-Remove-stream-and-simplify-operation-in-pathfinder.patch

@@ -1,4 +1,4 @@
-From 3298bf1cfdfd166ea4e3e0672aec5c0abf400ca2 Mon Sep 17 00:00:00 2001
+From 92c476dd12cb5965f1c793f37b1181460ac3dfcd Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 17:49:07 +0700
 Subject: [PATCH] Remove stream and simplify operation in pathfinder

patches/server/0022-Remove-a-few-more-streams.patch

@@ -1,4 +1,4 @@
-From 6c78e211340d417d966f0ac836db8fac179b93f4 Mon Sep 17 00:00:00 2001
+From 8f14fe9582edf5a744a0b52089800dc4f645b275 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Wed, 15 Apr 2020 22:45:48 +0700
 Subject: [PATCH] Remove a few more streams