From 12e36770c4dafdb938a4715d5f5ace066c3b4845 Mon Sep 17 00:00:00 2001
From: Ross Allan <rallanpcl@gmail.com>
Date: Sun, 28 Jul 2013 19:43:19 +0100
Subject: [PATCH] Fix Packet Profiler NPE

Signed-off-by: Ross Allan <rallanpcl@gmail.com>
---
 .../tickthreading/minecraft/profiling/PacketProfiler.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common/nallar/tickthreading/minecraft/profiling/PacketProfiler.java b/src/common/nallar/tickthreading/minecraft/profiling/PacketProfiler.java
index 36232914..4b713a6d 100644
--- a/src/common/nallar/tickthreading/minecraft/profiling/PacketProfiler.java
+++ b/src/common/nallar/tickthreading/minecraft/profiling/PacketProfiler.java
@@ -110,8 +110,9 @@ public static void record(final Packet packet) {
 		int size;
 		if (packet instanceof Packet250CustomPayload) {
 			Packet250CustomPayload packet250CustomPayload = (Packet250CustomPayload) packet;
-			id = ((Packet250CustomPayload) packet).channel + (packet250CustomPayload.data.length > 0 ? Byte.toString(packet250CustomPayload.data[0]) : Byte.MIN_VALUE);
-			size = packet250CustomPayload.data.length;
+			byte[] data = packet250CustomPayload.data;
+			size = data == null ? 0 : data.length;
+			id = packet250CustomPayload.channel + (size > 0 ? Byte.toString(data[0]) : Byte.MIN_VALUE);
 		} else {
 			id = String.valueOf(packet.getPacketId());
 			size = packet.getPacketSize();