diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2014-04-10 20:04:38 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2014-04-11 22:28:35 -0500 |
commit | 8f771c737850130534b0fade70494f7ce3cbc8fd (patch) | |
tree | e4180121cdaf4f15b325aa059469b44975fca8a4 /src/main/java/net/minecraft/server/NetworkManager.java | |
parent | 0df7555cecff17ffab68b8280dcf8471b10f020c (diff) | |
download | craftbukkit-8f771c737850130534b0fade70494f7ce3cbc8fd.tar craftbukkit-8f771c737850130534b0fade70494f7ce3cbc8fd.tar.gz craftbukkit-8f771c737850130534b0fade70494f7ce3cbc8fd.tar.lz craftbukkit-8f771c737850130534b0fade70494f7ce3cbc8fd.tar.xz craftbukkit-8f771c737850130534b0fade70494f7ce3cbc8fd.zip |
Update CraftBukkit to Minecraft 1.7.8
Diffstat (limited to 'src/main/java/net/minecraft/server/NetworkManager.java')
-rw-r--r-- | src/main/java/net/minecraft/server/NetworkManager.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java index 9ff1694d..1dd22279 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -40,6 +40,7 @@ public class NetworkManager extends SimpleChannelInboundHandler { private PacketListener o; private EnumProtocol p; private IChatBaseComponent q; + private boolean r; public NetworkManager(boolean flag) { this.j = flag; @@ -86,7 +87,7 @@ public class NetworkManager extends SimpleChannelInboundHandler { public void handle(Packet packet, GenericFutureListener... agenericfuturelistener) { if (this.m != null && this.m.isOpen()) { - this.h(); + this.i(); this.b(packet, agenericfuturelistener); } else { this.l.add(new QueuedPacket(packet, agenericfuturelistener)); @@ -113,7 +114,7 @@ public class NetworkManager extends SimpleChannelInboundHandler { } } - private void h() { + private void i() { if (this.m != null && this.m.isOpen()) { while (!this.l.isEmpty()) { QueuedPacket queuedpacket = (QueuedPacket) this.l.poll(); @@ -124,7 +125,7 @@ public class NetworkManager extends SimpleChannelInboundHandler { } public void a() { - this.h(); + this.i(); EnumProtocol enumprotocol = (EnumProtocol) this.m.attr(d).get(); if (this.p != enumprotocol) { @@ -171,6 +172,7 @@ public class NetworkManager extends SimpleChannelInboundHandler { public void a(SecretKey secretkey) { this.m.pipeline().addBefore("splitter", "decrypt", new PacketDecrypter(MinecraftEncryption.a(2, secretkey))); this.m.pipeline().addBefore("prepender", "encrypt", new PacketEncrypter(MinecraftEncryption.a(1, secretkey))); + this.r = true; } public boolean isConnected() { |