From d21c5f387111ba4f1fbc3420ce8d0f9da00e32c5 Mon Sep 17 00:00:00 2001
From: Travis Watkins <amaranth@ubuntu.com>
Date: Fri, 16 Nov 2012 16:15:41 -0600
Subject: Ignore empty custom payload packets. Fixes BUKKIT-2957

---
 src/main/java/net/minecraft/server/NetServerHandler.java | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/main/java')

diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index 86b6ad1c..831ad7ed 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -1458,6 +1458,12 @@ public class NetServerHandler extends NetHandler {
         ItemStack itemstack;
         ItemStack itemstack1;
 
+        // CraftBukkit start - ignore empty payloads
+        if (packet250custompayload.length <= 0) {
+            return;
+        }
+        // CraftBukkit end
+
         if ("MC|BEdit".equals(packet250custompayload.tag)) {
             try {
                 datainputstream = new DataInputStream(new ByteArrayInputStream(packet250custompayload.data));
-- 
cgit v1.2.3