From a36e2a4378381706d95fdd06d41c03da11cc1ec7 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 25 Nov 2016 20:35:15 +0000 Subject: [PATCH] Optimise NetworkManager --- .../Optimise-NetworkManager.patch | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 Spigot-Server-Patches/Optimise-NetworkManager.patch diff --git a/Spigot-Server-Patches/Optimise-NetworkManager.patch b/Spigot-Server-Patches/Optimise-NetworkManager.patch new file mode 100644 index 0000000000..fdd91a8412 --- /dev/null +++ b/Spigot-Server-Patches/Optimise-NetworkManager.patch @@ -0,0 +1,96 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Alfie Cleveland +Date: Fri, 25 Nov 2016 20:35:05 +0000 +Subject: [PATCH] Optimise NetworkManager + + +diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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> { + } + }; + private final EnumProtocolDirection h; +- private final Queue i = Queues.newConcurrentLinkedQueue(); +- private final ReentrantReadWriteLock j = new ReentrantReadWriteLock(); ++ // private final Queue i = Queues.newConcurrentLinkedQueue(); // Paper ++ // private final ReentrantReadWriteLock j = new ReentrantReadWriteLock(); // Paper + public Channel channel; + // Spigot Start // PAIL + public SocketAddress l; +@@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler> { + if (this.isConnected()) { + this.m(); + this.a(packet, (GenericFutureListener[]) null); +- } else { ++ } ++ // Paper start ++ /* else { + this.j.writeLock().lock(); + + try { +@@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler> { + } finally { + this.j.writeLock().unlock(); + } +- } +- ++ }*/ ++ // Paper end + } + + public void sendPacket(Packet packet, GenericFutureListener> genericfuturelistener, GenericFutureListener>... agenericfuturelistener) { + if (this.isConnected()) { + this.m(); + this.a(packet, (GenericFutureListener[]) ArrayUtils.add(agenericfuturelistener, 0, genericfuturelistener)); +- } else { ++ } ++ // Paper start ++ /* ++ else { + this.j.writeLock().lock(); + + try { +@@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler> { + this.j.writeLock().unlock(); + } + } +- ++ */ ++ // Paper end + } + + private void a(final Packet packet, @Nullable final GenericFutureListener>[] agenericfuturelistener) { +@@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler> { + } + + private void m() { +- if (this.channel != null && this.channel.isOpen()) { ++ // Paper start ++ /* if (this.channel != null && this.channel.isOpen()) { + this.j.readLock().lock(); + + try { +@@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler> { + this.j.readLock().unlock(); + } + +- } ++ }*/ ++ // Paper end + } + + public void a() { +@@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler> { + } else if (this.i() != null) { + this.i().a(new ChatComponentText("Disconnected")); + } +- this.i.clear(); // Free up packet queue. ++ // this.i.clear(); // Free up packet queue. // Paper - remove unneeded packet queue + } + + } +-- +2.9.3 (Apple Git-75) +