From 035204aad20e292f81a8620788087a89b2d69f4d Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 26 Feb 2013 11:19:08 +1100 Subject: [PATCH] Add missing config options. --- .../0028-Watchdog-Thread.patch | 19 ++++++++++++++-- CraftBukkit-Patches/0029-Netty.patch | 22 +++++++++++++++---- .../0031-Enable-Improved-ping-sending.patch | 17 ++++++++++++-- 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/CraftBukkit-Patches/0028-Watchdog-Thread.patch b/CraftBukkit-Patches/0028-Watchdog-Thread.patch index f5c6ec6f8a..e97fe782b3 100644 --- a/CraftBukkit-Patches/0028-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0028-Watchdog-Thread.patch @@ -1,4 +1,4 @@ -From 2efc3e1c63f1d0868965ed0df2a8d2a462c063dd Mon Sep 17 00:00:00 2001 +From bcc479e29c57f5e24066b2971a911e1e0aab02c7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Feb 2013 12:33:20 +1100 Subject: [PATCH] Watchdog Thread. @@ -8,7 +8,8 @@ Subject: [PATCH] Watchdog Thread. src/main/java/org/bukkit/craftbukkit/Spigot.java | 77 +++++++++++++++++- src/main/java/org/spigotmc/RestartCommand.java | 23 ++++++ src/main/java/org/spigotmc/WatchdogThread.java | 93 ++++++++++++++++++++++ - 4 files changed, 193 insertions(+), 2 deletions(-) + src/main/resources/configurations/bukkit.yml | 3 + + 5 files changed, 196 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/spigotmc/RestartCommand.java create mode 100644 src/main/java/org/spigotmc/WatchdogThread.java @@ -280,6 +281,20 @@ index 0000000..10390b8 + } + } +} +diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml +index 54e28db..e04ebce 100644 +--- a/src/main/resources/configurations/bukkit.yml ++++ b/src/main/resources/configurations/bukkit.yml +@@ -31,6 +31,9 @@ settings: + command-complete: true + spam-exclusions: + - /skill ++ timeout-time: 30 ++ restart-on-crash: false ++ restart-script-location: /path/to/server/start.sh + world-settings: + default: + growth-chunks-per-tick: 650 -- 1.8.1-rc2 diff --git a/CraftBukkit-Patches/0029-Netty.patch b/CraftBukkit-Patches/0029-Netty.patch index 6047b56052..4ef5def860 100644 --- a/CraftBukkit-Patches/0029-Netty.patch +++ b/CraftBukkit-Patches/0029-Netty.patch @@ -1,4 +1,4 @@ -From d53d91635104f6809f1bb666371b7fc4cb41fa16 Mon Sep 17 00:00:00 2001 +From d8aa2999094cf94e7a231d7ff5bd0b034ba5ba8a Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 14 Feb 2013 17:32:20 +1100 Subject: [PATCH] Netty @@ -49,7 +49,8 @@ Subject: [PATCH] Netty .../java/org/spigotmc/netty/PacketEncoder.java | 43 ++++ .../java/org/spigotmc/netty/PacketListener.java | 100 +++++++++ src/main/java/org/spigotmc/netty/ReadState.java | 16 ++ - 18 files changed, 931 insertions(+), 8 deletions(-) + src/main/resources/configurations/bukkit.yml | 2 + + 19 files changed, 933 insertions(+), 8 deletions(-) create mode 100644 src/main/java/net/minecraft/server/INetworkManager.java create mode 100644 src/main/java/org/spigotmc/netty/CipherCodec.java create mode 100644 src/main/java/org/spigotmc/netty/NettyNetworkManager.java @@ -570,7 +571,7 @@ index 0000000..6cb1b98 +} diff --git a/src/main/java/org/spigotmc/netty/NettyServerConnection.java b/src/main/java/org/spigotmc/netty/NettyServerConnection.java new file mode 100644 -index 0000000..586be63 +index 0000000..ed9dd12 --- /dev/null +++ b/src/main/java/org/spigotmc/netty/NettyServerConnection.java @@ -0,0 +1,109 @@ @@ -630,7 +631,7 @@ index 0000000..586be63 + .addLast("manager", new NettyNetworkManager()); + } + }).group(new NioEventLoopGroup(Spigot.nettyThreads, new ThreadFactoryBuilder().setNameFormat("Netty IO Thread - %1$d").build())).localAddress(host, port).bind(); -+ MinecraftServer.log.info("Using Netty NIO with {0} threads for network connections."); ++ MinecraftServer.log.info("Using Netty NIO with " + Spigot.nettyThreads + "threads for network connections."); + } + + /** @@ -1183,6 +1184,19 @@ index 0000000..5dc3754 + */ + DATA; +} +diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml +index e04ebce..7ccac52 100644 +--- a/src/main/resources/configurations/bukkit.yml ++++ b/src/main/resources/configurations/bukkit.yml +@@ -34,6 +34,8 @@ settings: + timeout-time: 30 + restart-on-crash: false + restart-script-location: /path/to/server/start.sh ++ use-netty: true ++ netty-threads: 3 + world-settings: + default: + growth-chunks-per-tick: 650 -- 1.8.1-rc2 diff --git a/CraftBukkit-Patches/0031-Enable-Improved-ping-sending.patch b/CraftBukkit-Patches/0031-Enable-Improved-ping-sending.patch index 04e1e79375..78a98897b6 100644 --- a/CraftBukkit-Patches/0031-Enable-Improved-ping-sending.patch +++ b/CraftBukkit-Patches/0031-Enable-Improved-ping-sending.patch @@ -1,4 +1,4 @@ -From 0374f99776040c7e5f14ac38c132bcc1bd43051f Mon Sep 17 00:00:00 2001 +From 8f43d31d0e67908e97627327ed3421574970f2d5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Feb 2013 20:45:20 +1100 Subject: [PATCH] Enable Improved ping sending @@ -6,7 +6,8 @@ Subject: [PATCH] Enable Improved ping sending --- src/main/java/net/minecraft/server/EntityPlayer.java | 1 + src/main/java/net/minecraft/server/PlayerList.java | 16 ++++++++++++++++ - 2 files changed, 17 insertions(+) + src/main/resources/configurations/bukkit.yml | 1 + + 3 files changed, 18 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 28f462b..933a2e7 100644 @@ -48,6 +49,18 @@ index d13fa19..6c19ad7 100644 public void sendAll(Packet packet) { for (int i = 0; i < this.players.size(); ++i) { +diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml +index e04ebce..03fff4c 100644 +--- a/src/main/resources/configurations/bukkit.yml ++++ b/src/main/resources/configurations/bukkit.yml +@@ -31,6 +31,7 @@ settings: + command-complete: true + spam-exclusions: + - /skill ++ tab-ping: false + timeout-time: 30 + restart-on-crash: false + restart-script-location: /path/to/server/start.sh -- 1.8.1-rc2