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

Reapply tick loop patch.

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-01-22 19:16:12 +11:00
parent a47cddd8bd
commit 2053478e45
8 changed files with 49 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0072-Configurable-Amount-of-Netty-Threads.patch
View File

@@ -1,4 +1,4 @@
From f90fa8326368b3ccd386b6a12ba643f0e8e34fcd Mon Sep 17 00:00:00 2001
From a9ac8accb027efbd0292d9d4e185a3c017c40054 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2013 11:58:58 +1100
Subject: [PATCH] Configurable Amount of Netty Threads
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Amount of Netty Threads
This brings back the option that the Spigot version of netty saw. By default Netty will try and use cores*2 threads, however if running multiple servers on the same machine, this can be too many threads. Additionally some people have 16 core servers. If 32 Netty threads are allowed in this setup, then the lock contention, and thus blocking between threads becomes much greater, leading to decreased performance.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1f057b1..eee0119 100644
index a55160f..ccf7abd 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -51,7 +51,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -18,7 +18,7 @@ index 1f057b1..eee0119 100644
private final ServerPing p = new ServerPing();
private final Random q = new Random();
private String serverIp;
@@ -112,7 +112,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -111,7 +111,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
i = this;
this.c = proxy;
// this.universe = file1; // CraftBukkit
@@ -27,7 +27,7 @@ index 1f057b1..eee0119 100644
this.n = new CommandDispatcher();
// this.convertable = new WorldLoaderServer(file1); // CraftBukkit - moved to DedicatedServer.init
this.S = (new YggdrasilAuthenticationService(proxy, UUID.randomUUID().toString())).createMinecraftSessionService();
@@ -1211,7 +1211,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -1219,7 +1219,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
public ServerConnection ag() {