diff options
author | feildmaster <admin@feildmaster.com> | 2012-07-29 02:33:13 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2012-08-02 04:58:50 -0500 |
commit | a43d621c0138110d2ec362b2eaa8f938f241bb49 (patch) | |
tree | d2ebc0d7a4a969d3257b1b958236428a24117eb1 /src/main/java/net/minecraft/server/NetworkAcceptThread.java | |
parent | 08e2923bd4282579ca0cf7af0e6207cba0591e5c (diff) | |
download | craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.tar craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.tar.gz craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.tar.lz craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.tar.xz craftbukkit-a43d621c0138110d2ec362b2eaa8f938f241bb49.zip |
Update CraftBukkit to Minecraft 1.3.1
Diffstat (limited to 'src/main/java/net/minecraft/server/NetworkAcceptThread.java')
-rw-r--r-- | src/main/java/net/minecraft/server/NetworkAcceptThread.java | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/src/main/java/net/minecraft/server/NetworkAcceptThread.java b/src/main/java/net/minecraft/server/NetworkAcceptThread.java deleted file mode 100644 index 97590561..00000000 --- a/src/main/java/net/minecraft/server/NetworkAcceptThread.java +++ /dev/null @@ -1,56 +0,0 @@ -package net.minecraft.server; - -import java.io.IOException; -import java.net.InetAddress; -import java.net.Socket; - -class NetworkAcceptThread extends Thread { - - final MinecraftServer a; - - final NetworkListenThread listenThread; - - long connectionThrottle; // CraftBukkit - - NetworkAcceptThread(NetworkListenThread networklistenthread, String s, MinecraftServer minecraftserver) { - super(s); - this.listenThread = networklistenthread; - this.a = minecraftserver; - } - - public void run() { - while (this.listenThread.b) { - try { - Socket socket = NetworkListenThread.a(this.listenThread).accept(); - - if (socket != null) { - synchronized (NetworkListenThread.getRecentConnectionAttempts(this.listenThread)) { - InetAddress inetaddress = socket.getInetAddress(); - // CraftBukkit start - if (this.a.server == null) { - socket.close(); - continue; - } - connectionThrottle = this.a.server.getConnectionThrottle(); - // CraftBukkit end - - // CraftBukkit - if (NetworkListenThread.getRecentConnectionAttempts(this.listenThread).containsKey(inetaddress) && !"127.0.0.1".equals(inetaddress.getHostAddress()) && System.currentTimeMillis() - ((Long) NetworkListenThread.getRecentConnectionAttempts(this.listenThread).get(inetaddress)).longValue() < connectionThrottle) { - NetworkListenThread.getRecentConnectionAttempts(this.listenThread).put(inetaddress, Long.valueOf(System.currentTimeMillis())); - socket.close(); - continue; - } - - NetworkListenThread.getRecentConnectionAttempts(this.listenThread).put(inetaddress, Long.valueOf(System.currentTimeMillis())); - } - - NetLoginHandler netloginhandler = new NetLoginHandler(this.a, socket, "Connection #" + NetworkListenThread.c(this.listenThread)); - - NetworkListenThread.a(this.listenThread, netloginhandler); - } - } catch (IOException ioexception) { - ioexception.printStackTrace(); - } - } - } -} |