summaryrefslogtreecommitdiffstats
path: root/src/main/java/net
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2012-04-25 10:34:53 -0500
committerTravis Watkins <amaranth@ubuntu.com>2012-04-25 10:34:53 -0500
commit0153fe1f33c5b06ecd170cf107d975c1e9c53159 (patch)
treecd4ac954af5868af16cf017e5adec672a70e83b0 /src/main/java/net
parentefab1e8b183086323398d2f4c268d50071c51d31 (diff)
downloadcraftbukkit-0153fe1f33c5b06ecd170cf107d975c1e9c53159.tar
craftbukkit-0153fe1f33c5b06ecd170cf107d975c1e9c53159.tar.gz
craftbukkit-0153fe1f33c5b06ecd170cf107d975c1e9c53159.tar.lz
craftbukkit-0153fe1f33c5b06ecd170cf107d975c1e9c53159.tar.xz
craftbukkit-0153fe1f33c5b06ecd170cf107d975c1e9c53159.zip
Check if packet is null before checking priority. Fixes BUKKIT-1579
Diffstat (limited to 'src/main/java/net')
-rw-r--r--src/main/java/net/minecraft/server/NetServerHandler.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index 65c11650..d07b1146 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -720,7 +720,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
this.networkManager.queue(new Packet3Chat(line));
}
packet = null;
- } else if (packet.lowPriority == true) {
+ } else if (packet != null && packet.lowPriority == true) {
// Reroute all low-priority packets through to compression thread.
ChunkCompressionThread.sendPacket(this.player, packet);
packet = null;