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

Update to 1.7.5

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-03-23 00:06:43 +00:00
parent 2bba2bc54f
commit b215942177
70 changed files with 583 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CraftBukkit-Patches/0070-Configurable-Amount-of-Netty-Threads.patch
View File

@@ -1,4 +1,4 @@
From 7818de038076bd8bb1b44dc3fb2359ef59935ae3 Mon Sep 17 00:00:00 2001
From 3fb9cd50fbf94768db176c008993ed705b40401f 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,10 +6,10 @@ 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 1e83999..94da13d 100644
index 2407ab2..41a690b 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
@@ -52,7 +52,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
private final List m = new ArrayList();
private final ICommandHandler n;
public final MethodProfiler methodProfiler = new MethodProfiler();
@@ -18,7 +18,7 @@ index 1e83999..94da13d 100644
private final ServerPing p = new ServerPing();
private final Random q = new Random();
private String serverIp;
@@ -106,7 +106,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -107,7 +107,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
i = this;
this.c = proxy;
// this.universe = file1; // CraftBukkit
@@ -27,15 +27,15 @@ index 1e83999..94da13d 100644
this.n = new CommandDispatcher();
// this.convertable = new WorldLoaderServer(file1); // CraftBukkit - moved to DedicatedServer.init
this.S = (new YggdrasilAuthenticationService(proxy, UUID.randomUUID().toString())).createMinecraftSessionService();
@@ -1227,7 +1227,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -1230,7 +1230,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
}
public ServerConnection ag() {
public ServerConnection ah() {
- return this.o;
+ return ( this.o ) == null ? this.o = new ServerConnection( this ) : this.o; // Spigot
}
public boolean ai() {
public boolean aj() {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 08bd5ba..cfddd28 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
@@ -53,5 +53,5 @@ index 08bd5ba..cfddd28 100644
+ }
}
--
1.8.3.2
1.8.5.2.msysgit.0