mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-03 05:26:50 +01:00
fe031329f3
You can now specify how many letters of the command must be typed before it will be tab completed this will help deter people from just spamming round all the commands to see if there is one incorrectly set up. 0 will tab complete all commands -1 will disable tab complete 1 will mean you have to type the first letter 2 will mean you have to the second letter... etc...
57 lines
2.8 KiB
Diff
57 lines
2.8 KiB
Diff
From b00d4f7e51de301740148b6ce62e2630aa5dae50 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
|
|
|
|
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 2407ab2..41a690b 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -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();
|
|
- private final ServerConnection o;
|
|
+ private ServerConnection o; // Spigot
|
|
private final ServerPing p = new ServerPing();
|
|
private final Random q = new Random();
|
|
private String serverIp;
|
|
@@ -107,7 +107,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
|
i = this;
|
|
this.c = proxy;
|
|
// this.universe = file1; // CraftBukkit
|
|
- this.o = new ServerConnection(this);
|
|
+ // this.o = new ServerConnection(this); // Spigot
|
|
this.n = new CommandDispatcher();
|
|
// this.convertable = new WorldLoaderServer(file1); // CraftBukkit - moved to DedicatedServer.init
|
|
this.S = (new YggdrasilAuthenticationService(proxy, UUID.randomUUID().toString())).createMinecraftSessionService();
|
|
@@ -1230,7 +1230,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
|
}
|
|
|
|
public ServerConnection ah() {
|
|
- return this.o;
|
|
+ return ( this.o ) == null ? this.o = new ServerConnection( this ) : this.o; // Spigot
|
|
}
|
|
|
|
public boolean aj() {
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
index 8bfffa5..b3278fd 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
@@ -202,4 +202,11 @@ public class SpigotConfig
|
|
}
|
|
bungee = getBoolean( "settings.bungeecord", false );
|
|
}
|
|
+
|
|
+ private static void nettyThreads()
|
|
+ {
|
|
+ int count = getInt( "settings.netty-threads", 4 );
|
|
+ System.setProperty( "io.netty.eventLoopThreads", Integer.toString( count ) );
|
|
+ Bukkit.getLogger().log( Level.INFO, "Using {0} threads for Netty based IO", count );
|
|
+ }
|
|
}
|
|
--
|
|
1.8.3.2
|
|
|