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/NetworkWriterThread.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/NetworkWriterThread.java')
-rw-r--r-- | src/main/java/net/minecraft/server/NetworkWriterThread.java | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/src/main/java/net/minecraft/server/NetworkWriterThread.java b/src/main/java/net/minecraft/server/NetworkWriterThread.java index 140fcd2d..68d84deb 100644 --- a/src/main/java/net/minecraft/server/NetworkWriterThread.java +++ b/src/main/java/net/minecraft/server/NetworkWriterThread.java @@ -12,28 +12,18 @@ class NetworkWriterThread extends Thread { } public void run() { - Object object = NetworkManager.a; + NetworkManager.b.getAndIncrement(); - synchronized (NetworkManager.a) { - ++NetworkManager.c; - } - - while (true) { - boolean flag = false; + try { + while (NetworkManager.a(this.a)) { + boolean flag; - try { - flag = true; - if (!NetworkManager.a(this.a)) { - flag = false; - break; - } - - while (NetworkManager.d(this.a)) { + for (flag = false; NetworkManager.d(this.a); flag = true) { ; } try { - if (NetworkManager.e(this.a) != null) { + if (flag && NetworkManager.e(this.a) != null) { NetworkManager.e(this.a).flush(); } } catch (IOException ioexception) { @@ -49,20 +39,9 @@ class NetworkWriterThread extends Thread { } catch (InterruptedException interruptedexception) { ; } - } finally { - if (flag) { - Object object1 = NetworkManager.a; - - synchronized (NetworkManager.a) { - --NetworkManager.c; - } - } } - } - - object = NetworkManager.a; - synchronized (NetworkManager.a) { - --NetworkManager.c; + } finally { + NetworkManager.b.getAndDecrement(); } } } |