SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing config options.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-02-26 11:19:08 +11:00
parent c3f23f2bef
commit dbfd5fc5b0
3 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CraftBukkit-Patches/0029-Netty.patch
View File

@@ -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 <md_5@live.com.au>
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