Remove patch no longer functional (#384)

Author: uRyanxD

README.md

@@ -12,7 +12,6 @@ Fork of Paper for 1.8.8 focused on improved performance and stability.
     - **Updating to Netty 4.1** offers the ability to use newer Java versions with epoll on Linux.
     - **Improved flush handling** to massively improve entity tracker performance.
     - **Support for Unix domain sockets** to avoid the overhead of TCP when using a proxy on the same machine.
-    - **Using LazyRunnables** to avoid expensive thread wakeup calls when sending non-flushed packets.
 
 - **More configuration options**, such as:
     - Customizable knockback

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=0d585f69da091fc5b2beced877feab55a3064d43b8a1d46aeb07996b0915e0e0
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
+distributionSha256Sum=b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

patches/server/0010-Optimize-Network-Manager-and-add-advanced-packet-sup.patch

@@ -26,7 +26,7 @@ Also avoids spamming closed channel exception by rechecking closed state in disp
 and then catch exceptions and close if they fire.
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 52a4ddbb898901a41dd171a34f712e7139f6db8f..108464c874585853de4f9cffc90d57f39dfbef8b 100644
+index 52a4ddbb898901a41dd171a34f712e7139f6db8f..baf4cb424e801dd8ae72080c089bea44de863981 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -62,7 +62,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
@@ -106,7 +106,7 @@ index 52a4ddbb898901a41dd171a34f712e7139f6db8f..108464c874585853de4f9cffc90d57f3
          } else {
 -            this.j.writeLock().lock();
 +            java.util.List<NetworkManager.QueuedPacket> packets = new java.util.ArrayList<>(1 + extraPackets.size());
-+            packets.add(new NetworkManager.QueuedPacket(packet, (GenericFutureListener<? extends Future<? super Void>>) null)); // delay the future listener until the end of the extra packets
++            packets.add(new NetworkManager.QueuedPacket(packet, (GenericFutureListener<? extends Future<? super Void>>[]) null)); // delay the future listener until the end of the extra packets
 
 -            try {
 -                this.i.add(new NetworkManager.QueuedPacket(packet, (GenericFutureListener[]) ArrayUtils.add(agenericfuturelistener, 0, genericfuturelistener)));
@@ -128,102 +128,86 @@ index 52a4ddbb898901a41dd171a34f712e7139f6db8f..108464c874585853de4f9cffc90d57f3
      private void a(final Packet packet, final GenericFutureListener<? extends Future<? super Void>>[] agenericfuturelistener) {
          final EnumProtocol enumprotocol = EnumProtocol.a(packet);
          final EnumProtocol enumprotocol1 = (EnumProtocol) this.channel.attr(NetworkManager.c).get();
-@@ -178,6 +195,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
-         }
- 
-         if (this.channel.eventLoop().inEventLoop()) {
-+            // PandaSpigot start - Simplify
-+            /*
-             if (enumprotocol != enumprotocol1) {
+@@ -182,13 +199,34 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
                  this.a(enumprotocol);
              }
-@@ -189,42 +208,107 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
+ 
++            // PandaSpigot start
++            EntityPlayer player = getPlayer();
++            if (!isConnected()) {
++                packet.onPacketDispatchFinish(player, null);
++                return;
++            }
++            try {
++            // PandaSpigot end
+             ChannelFuture channelfuture = this.channel.writeAndFlush(packet);
+ 
+             if (agenericfuturelistener != null) {
+                 channelfuture.addListeners(agenericfuturelistener);
              }
 
++            // PandaSpigot start
++            if (packet.hasFinishListener()) {
++                channelfuture.addListener((ChannelFutureListener) channelFuture -> packet.onPacketDispatchFinish(player, channelFuture));
++            }
++            // PandaSpigot end
++
              channelfuture.addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
-+            */
-+            doSendPacket(packet, enumprotocol, enumprotocol1, agenericfuturelistener);
++            // PandaSpigot start
++            } catch (Exception e) {
++                g.error("NetworkException: {}", player, e);
++                close(new ChatMessage("disconnect.genericReason", "Internal Exception: " + e.getMessage()));
++                packet.onPacketDispatchFinish(player, null);
++            }
 +            // PandaSpigot end
          } else {
--            this.channel.eventLoop().execute(new Runnable() {
--                public void run() {
--                    if (enumprotocol != enumprotocol1) {
--                        NetworkManager.this.a(enumprotocol);
--                    }
--
--                    ChannelFuture channelfuture = NetworkManager.this.channel.writeAndFlush(packet);
--
--                    if (agenericfuturelistener != null) {
--                        channelfuture.addListeners(agenericfuturelistener);
--                    }
-+            // PandaSpigot start - Simplify
-+            this.channel.eventLoop().execute(() -> {
-+                /*
-+                if (enumprotocol != enumprotocol1) {
-+                    NetworkManager.this.a(enumprotocol);
-+                }
-+                ChannelFuture channelfuture = NetworkManager.this.channel.writeAndFlush(packet);
+             this.channel.eventLoop().execute(new Runnable() {
+                 public void run() {
+@@ -196,35 +234,80 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
+                         NetworkManager.this.a(enumprotocol);
+                     }
 
--                    channelfuture.addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
-+                if (agenericfuturelistener != null) {
-+                    channelfuture.addListeners(agenericfuturelistener);
-                 }
++                    // PandaSpigot start
++                    EntityPlayer player = getPlayer();
++                    if (!isConnected()) {
++                        packet.onPacketDispatchFinish(player, null);
++                        return;
++                    }
++                    try {
++                    // PandaSpigot end
+                     ChannelFuture channelfuture = NetworkManager.this.channel.writeAndFlush(packet);
+ 
+                     if (agenericfuturelistener != null) {
+                         channelfuture.addListeners(agenericfuturelistener);
+                     }
+ 
++                    // PandaSpigot start
++                    if (packet.hasFinishListener()) {
++                        channelfuture.addListener((ChannelFutureListener) channelFuture -> packet.onPacketDispatchFinish(player, channelFuture));
++                    }
++                    // PandaSpigot end
 +
-+                channelfuture.addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
-+                */
-+                doSendPacket(packet, enumprotocol, enumprotocol1, agenericfuturelistener);
+                     channelfuture.addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
++                    // PandaSpigot start
++                    } catch (Exception e) {
++                        g.error("NetworkException: {}", player, e);
++                        close(new ChatMessage("disconnect.genericReason", "Internal Exception: " + e.getMessage()));
++                        packet.onPacketDispatchFinish(player, null);
++                    }
++                    // PandaSpigot end
+                 }
              });
-+            // PandaSpigot end
          }
 
      }
 
 -    private void m() {
 -        if (this.channel != null && this.channel.isOpen()) {
 -            this.j.readLock().lock();
-+    // PandaSpigot start - Add helper method
-+    private void doSendPacket(Packet<?> packet, EnumProtocol enumprotocol, EnumProtocol enumprotocol1, GenericFutureListener<? extends Future<? super Void>>[] agenericfuturelistener) {
-+        if (enumprotocol != enumprotocol1) {
-+            NetworkManager.this.a(enumprotocol);
-+        }
- 
+-
 -            try {
 -                while (!this.i.isEmpty()) {
 -                    NetworkManager.QueuedPacket networkmanager_queuedpacket = (NetworkManager.QueuedPacket) this.i.poll();
-+        // PandaSpigot start
-+        EntityPlayer player = getPlayer();
-+        if (!isConnected()) {
-+            packet.onPacketDispatchFinish(player, null);
-+            return;
-+        }
-+        try {
-+            // PandaSpigot end
-+            ChannelFuture channelfuture = NetworkManager.this.channel.writeAndFlush(packet);
- 
--                    this.a(networkmanager_queuedpacket.a, networkmanager_queuedpacket.b);
--                }
--            } finally {
--                this.j.readLock().unlock();
-+            if (agenericfuturelistener != null) {
-+                channelfuture.addListeners(agenericfuturelistener);
-+            }
-+
-+            // PandaSpigot start
-+            if (packet.hasFinishListener()) {
-+                channelfuture.addListener((ChannelFutureListener) channelFuture -> packet.onPacketDispatchFinish(player, channelFuture));
-+            }
-+            // PandaSpigot end
-+            channelfuture.addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
-+            // PandaSpigot start
-+        } catch (Exception e) {
-+            g.error("NetworkException: {}", player, e);
-+            close(new ChatMessage("disconnect.genericReason", "Internal Exception: " + e.getMessage()));
-+            packet.onPacketDispatchFinish(player, null);
-+        }
-+        // PandaSpigot end
-+    }
-+    // PandaSpigot end
-+
 +    // PandaSpigot start - rewrite this to be safer if ran off main thread
 +    private boolean sendPacketQueue() { return this.m(); } // OBFHELPER // void -> boolean
 +    private boolean m() { // void -> boolean
@@ -240,7 +224,11 @@ index 52a4ddbb898901a41dd171a34f712e7139f6db8f..108464c874585853de4f9cffc90d57f3
 +        }
 +        return false;
 +    }
-+
+ 
+-                    this.a(networkmanager_queuedpacket.a, networkmanager_queuedpacket.b);
+-                }
+-            } finally {
+-                this.j.readLock().unlock();
 +    private boolean processQueue() {
 +        if (i.isEmpty()) return true;
 +        // If we are on main, we are safe here in that nothing else should be processing queue off main anymore
@@ -267,7 +255,7 @@ index 52a4ddbb898901a41dd171a34f712e7139f6db8f..108464c874585853de4f9cffc90d57f3
 
      public void a() {
          this.m();
-@@ -239,9 +323,23 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
+@@ -239,9 +322,23 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
          return this.l;
      }
 
@@ -291,15 +279,15 @@ index 52a4ddbb898901a41dd171a34f712e7139f6db8f..108464c874585853de4f9cffc90d57f3
          // Spigot End
          if (this.channel.isOpen()) {
              this.channel.close(); // We can't wait as this may be called from an event loop.
-@@ -260,6 +358,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
+@@ -260,6 +357,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
          this.channel.pipeline().addBefore("prepender", "encrypt", new PacketEncrypter(MinecraftEncryption.a(1, secretkey)));
      }
 
 +    public boolean isConnected() { return this.g(); } // PandaSpigot - OBFHELPER
      public boolean g() {
          return this.channel != null && this.channel.isOpen();
      }
-@@ -314,9 +413,9 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
+@@ -314,9 +412,9 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
                  } else if (this.getPacketListener() != null) {
                      this.getPacketListener().a(new ChatComponentText("Disconnected"));
                  }
@@ -311,7 +299,7 @@ index 52a4ddbb898901a41dd171a34f712e7139f6db8f..108464c874585853de4f9cffc90d57f3
              }
 
          }
-@@ -328,8 +427,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
+@@ -328,8 +426,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
 
      static class QueuedPacket {
 
@@ -322,7 +310,7 @@ index 52a4ddbb898901a41dd171a34f712e7139f6db8f..108464c874585853de4f9cffc90d57f3
 
          public QueuedPacket(Packet packet, GenericFutureListener<? extends Future<? super Void>>... agenericfuturelistener) {
              this.a = packet;
-@@ -348,4 +447,44 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
+@@ -348,4 +446,44 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
          return this.channel.remoteAddress();
      }
      // Spigot End