From 7ae39f39cbb99ee9f7412fe1cedb6e2434a31b21 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 17 Feb 2013 20:06:57 +1100 Subject: [PATCH] Use release Netty to avoid performance regressions. --- CraftBukkit-Patches/0025-Netty.patch | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/CraftBukkit-Patches/0025-Netty.patch b/CraftBukkit-Patches/0025-Netty.patch index 4bc729ae5..ff38c172e 100644 --- a/CraftBukkit-Patches/0025-Netty.patch +++ b/CraftBukkit-Patches/0025-Netty.patch @@ -1,4 +1,4 @@ -From bc0a1d00c692dcef71565d3288b5c52ceb0e699b Mon Sep 17 00:00:00 2001 +From 068d76f55fb9f85fbcc504d8627aa1ee64e5a07f Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 14 Feb 2013 17:32:20 +1100 Subject: [PATCH] Netty @@ -12,7 +12,7 @@ The code within this commit has been very lightly tested in production (300 play This commit provides a reduction in threads, which gives the CPU / operating system more time to allocate to the main server threads, as well as various other side benefits such as chat thread pooling and a slight reduction in latency. This commit is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported license. --- - pom.xml | 10 + + pom.xml | 5 + .../java/net/minecraft/server/DedicatedServer.java | 2 +- .../net/minecraft/server/Packet51MapChunk.java | 2 +- .../net/minecraft/server/Packet56MapChunkBulk.java | 2 +- @@ -25,7 +25,7 @@ This commit is licensed under the Creative Commons Attribution-ShareAlike 3.0 Un .../java/org/spigotmc/netty/PacketEncoder.java | 43 ++++ .../java/org/spigotmc/netty/PacketListener.java | 100 +++++++++ src/main/java/org/spigotmc/netty/ReadState.java | 16 ++ - 13 files changed, 868 insertions(+), 7 deletions(-) + 13 files changed, 863 insertions(+), 7 deletions(-) create mode 100644 src/main/java/org/spigotmc/netty/CipherCodec.java create mode 100644 src/main/java/org/spigotmc/netty/NettyNetworkManager.java create mode 100644 src/main/java/org/spigotmc/netty/NettyServerConnection.java @@ -36,29 +36,17 @@ This commit is licensed under the Creative Commons Attribution-ShareAlike 3.0 Un create mode 100644 src/main/java/org/spigotmc/netty/ReadState.java diff --git a/pom.xml b/pom.xml -index f17bd19..fc7bfa0 100644 +index f17bd19..d84ac12 100644 --- a/pom.xml +++ b/pom.xml -@@ -29,6 +29,11 @@ - repobo-snap - http://repo.bukkit.org/content/groups/public - -+ -+ sonatype-nexus-snapshots -+ Sonatype Nexus Snapshots -+ https://oss.sonatype.org/content/repositories/snapshots -+ - - - -@@ -132,6 +137,11 @@ +@@ -132,6 +132,11 @@ trove4j 3.0.2 + + io.netty + netty -+ 4.0.0.Beta1-SNAPSHOT ++ 4.0.0.Beta1 +