From 96cc518fb04d5c75492be0de20c237adb39d0f0d Mon Sep 17 00:00:00 2001 From: "Kristian S. Stangeland" Date: Thu, 30 Jan 2014 02:04:38 +0100 Subject: [PATCH] Throw a more descriptive error of a packet type hasn't got a class. --- .../com/comphenix/protocol/injector/StructureCache.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/StructureCache.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/StructureCache.java index 46d45564..54902cb6 100644 --- a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/StructureCache.java +++ b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/StructureCache.java @@ -60,7 +60,12 @@ public class StructureCache { */ public static Object newPacket(PacketType type) { try { - return PacketRegistry.getPacketClassFromType(type, true).newInstance(); + Class clazz = PacketRegistry.getPacketClassFromType(type, true); + + // Check the return value + if (clazz != null) + return clazz.newInstance(); + throw new IllegalArgumentException("Cannot find associated packet class: " + type); } catch (InstantiationException e) { return null; } catch (IllegalAccessException e) {