diff options
author | feildmaster <admin@feildmaster.com> | 2012-12-19 22:03:52 -0600 |
---|---|---|
committer | feildmaster <admin@feildmaster.com> | 2012-12-20 10:43:00 -0600 |
commit | 23b67643741d5754af4de020a29d557078f9f81d (patch) | |
tree | 90e1a32f7eb94af49a381cb6bc34bf6247f0efe6 /src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java | |
parent | 9f1bf124eec7c20f16b2034fd9fba55f70c805fd (diff) | |
download | craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar.gz craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar.lz craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar.xz craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.zip |
Update CraftBukkit to Minecraft 1.4.6
Diffstat (limited to 'src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java')
-rw-r--r-- | src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java b/src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java index 311265fc..25e2ac1d 100644 --- a/src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java +++ b/src/main/java/net/minecraft/server/DedicatedServerConnectionThread.java @@ -38,20 +38,20 @@ public class DedicatedServerConnectionThread extends Thread { synchronized (this.b) { for (int i = 0; i < this.b.size(); ++i) { - NetLoginHandler netloginhandler = (NetLoginHandler) this.b.get(i); + PendingConnection pendingconnection = (PendingConnection) this.b.get(i); try { - netloginhandler.c(); + pendingconnection.c(); } catch (Exception exception) { - netloginhandler.disconnect("Internal server error"); - a.log(Level.WARNING, "Failed to handle packet for " + netloginhandler.getName() + ": " + exception, exception); + pendingconnection.disconnect("Internal server error"); + a.log(Level.WARNING, "Failed to handle packet for " + pendingconnection.getName() + ": " + exception, exception); } - if (netloginhandler.c) { + if (pendingconnection.c) { this.b.remove(i--); } - netloginhandler.networkManager.a(); + pendingconnection.networkManager.a(); } } } @@ -83,9 +83,9 @@ public class DedicatedServerConnectionThread extends Thread { this.c.put(inetaddress, Long.valueOf(i)); } - NetLoginHandler netloginhandler = new NetLoginHandler(this.f.d(), socket, "Connection #" + this.d++); + PendingConnection pendingconnection = new PendingConnection(this.f.d(), socket, "Connection #" + this.d++); - this.a(netloginhandler); + this.a(pendingconnection); } catch (IOException ioexception) { a.warning("DSCT: " + ioexception.getMessage()); // CraftBukkit } @@ -94,14 +94,14 @@ public class DedicatedServerConnectionThread extends Thread { System.out.println("Closing listening thread"); } - private void a(NetLoginHandler netloginhandler) { - if (netloginhandler == null) { + private void a(PendingConnection pendingconnection) { + if (pendingconnection == null) { throw new IllegalArgumentException("Got null pendingconnection!"); } else { List list = this.b; synchronized (this.b) { - this.b.add(netloginhandler); + this.b.add(pendingconnection); } } } |