Fix Packet Profiler NPE

Signed-off-by: Ross Allan <rallanpcl@gmail.com>
MinimallyCorrect · Jul 29, 2013 · 12e3677 · 12e3677
1 parent 32d8c08
commit 12e3677
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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();