Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore configurable connection throttle.

Browse Source
This commit is contained in:
Travis Watkins 2012-08-03 00:46:21 -05:00
parent e156354a60
commit dcf83bc1b5
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java
View File

@ -22,7 +22,9 @@ public class DedicatedServerConnectionThread extends Thread {
private final InetAddress g; private final InetAddress g;
private final int h; private final int h;
public DedicatedServerConnectionThread(ServerConnection serverconnection, InetAddress inetaddress, int i) { long connectionThrottle; // CraftBukkit
public DedicatedServerConnectionThread(ServerConnection serverconnection, InetAddress inetaddress, int i) throws IOException { // CraftBukkit - added throws
super("Listen thread"); super("Listen thread");
this.f = serverconnection; this.f = serverconnection;
this.g = inetaddress; this.g = inetaddress;
@ -62,8 +64,17 @@ public class DedicatedServerConnectionThread extends Thread {
long i = System.currentTimeMillis(); long i = System.currentTimeMillis();
HashMap hashmap = this.c; HashMap hashmap = this.c;
// CraftBukkit start
if (((MinecraftServer) this.f.d()).server == null) {
socket.close();
continue;
}
connectionThrottle = ((MinecraftServer) this.f.d()).server.getConnectionThrottle();
// CraftBukkit end
synchronized (this.c) { synchronized (this.c) {
if (this.c.containsKey(inetaddress) && !b(inetaddress) && i - ((Long) this.c.get(inetaddress)).longValue() < 4000L) { if (this.c.containsKey(inetaddress) && !b(inetaddress) && i - ((Long) this.c.get(inetaddress)).longValue() < connectionThrottle) {
this.c.put(inetaddress, Long.valueOf(i)); this.c.put(inetaddress, Long.valueOf(i));
socket.close(); socket.close();
continue; continue;