OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-23 08:46:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Connection Throttle handling. Fixes BUKKIT-1279

Browse source
This commit is contained in:
EvilSeph 2012-03-22 18:54:30 -04:00
parent 8fb141bfa0
commit ddaf3c84d3
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/net/minecraft/server/NetworkAcceptThread.java
View file

@ -26,7 +26,13 @@ class NetworkAcceptThread extends Thread {
if (socket != null) { if (socket != null) {
synchronized (NetworkListenThread.getRecentConnectionAttempts(this.listenThread)) { synchronized (NetworkListenThread.getRecentConnectionAttempts(this.listenThread)) {
InetAddress inetaddress = socket.getInetAddress(); InetAddress inetaddress = socket.getInetAddress();
connectionThrottle = this.a.server.getConnectionThrottle(); // CraftBukkit // CraftBukkit start
if (this.a.server == null) {
socket.close();
continue;
}
connectionThrottle = this.a.server.getConnectionThrottle();
// CraftBukkit end
// CraftBukkit // CraftBukkit
if (NetworkListenThread.getRecentConnectionAttempts(this.listenThread).containsKey(inetaddress) && System.currentTimeMillis() - ((Long) NetworkListenThread.getRecentConnectionAttempts(this.listenThread).get(inetaddress)).longValue() < connectionThrottle) { if (NetworkListenThread.getRecentConnectionAttempts(this.listenThread).containsKey(inetaddress) && System.currentTimeMillis() - ((Long) NetworkListenThread.getRecentConnectionAttempts(this.listenThread).get(inetaddress)).longValue() < connectionThrottle) {