Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-24 18:07:39 +01:00
Code Issues Projects Releases Wiki Activity

Added configurable Connection Throttle. Addresses BUKKIT-1274

Browse Source
This commit is contained in:
EvilSeph 2012-03-22 08:03:24 -04:00
parent dda37aa18c
commit c2cdeac09b
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minecraft/server/NetworkAcceptThread.java
View File

@ -10,6 +10,8 @@ class NetworkAcceptThread extends Thread {
final NetworkListenThread listenThread;
long connectionThrottle; // CraftBukkit
NetworkAcceptThread(NetworkListenThread networklistenthread, String s, MinecraftServer minecraftserver) {
super(s);
this.listenThread = networklistenthread;
@ -24,9 +26,10 @@ class NetworkAcceptThread extends Thread {
if (socket != null) {
synchronized (NetworkListenThread.getRecentConnectionAttempts(this.listenThread)) {
InetAddress inetaddress = socket.getInetAddress();
connectionThrottle = this.a.server.getConnectionThrottle(); // CraftBukkit
// CraftBukkit
if (NetworkListenThread.getRecentConnectionAttempts(this.listenThread).containsKey(inetaddress) && System.currentTimeMillis() - ((Long) NetworkListenThread.getRecentConnectionAttempts(this.listenThread).get(inetaddress)).longValue() < 4000L) {
if (NetworkListenThread.getRecentConnectionAttempts(this.listenThread).containsKey(inetaddress) && System.currentTimeMillis() - ((Long) NetworkListenThread.getRecentConnectionAttempts(this.listenThread).get(inetaddress)).longValue() < connectionThrottle) {
NetworkListenThread.getRecentConnectionAttempts(this.listenThread).put(inetaddress, Long.valueOf(System.currentTimeMillis()));
socket.close();
continue;

4
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@ -424,6 +424,10 @@ public final class CraftServer implements Server {
return this.configuration.getInt("settings.ping-packet-limit", 100);
}
public long getConnectionThrottle() {
return this.configuration.getInt("settings.connection-throttle");
}
public int getTicksPerAnimalSpawns() {
return this.configuration.getInt("ticks-per.animal-spawns");
}

1
src/main/resources/configurations/bukkit.yml
View File

@ -22,6 +22,7 @@ settings:
ping-packet-limit: 100
use-exact-login-location: false
plugin-profiling: false
connection-throttle: 4000
ticks-per:
animal-spawns: 400
monster-spawns: 1