Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-09-14 16:47:50 +02:00
Code Issues Projects Releases Wiki Activity

Handle the possibility that getSuperclass() returns NULL.

Browse Source 
Thanks to libraryaddict for discovering this bug.
This commit is contained in:
Kristian S. Stangeland 2014-04-10 20:24:24 +02:00
parent 4dea26b847
commit c84a5d7fa2
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ProtocolLib/src/main/java/com/comphenix/protocol/CommandPacket.java
View File

@ -339,8 +339,9 @@ class CommandPacket extends CommandBase {
Class<?> clazz = packet.getClass();
// Get the first Minecraft super class
while ((!MinecraftReflection.isMinecraftClass(clazz) ||
Factory.class.isAssignableFrom(clazz)) && clazz != Object.class) {
while (clazz != null && clazz != Object.class &&
(!MinecraftReflection.isMinecraftClass(clazz) ||
Factory.class.isAssignableFrom(clazz))) {
clazz = clazz.getSuperclass();
}

2
ProtocolLib/src/main/java/com/comphenix/protocol/reflect/ObjectWriter.java
View File

@ -119,7 +119,7 @@ public class ObjectWriter {
// Copy private fields underneath
Class<?> superclass = commonType.getSuperclass();
if (!superclass.equals(Object.class)) {
if (superclass != null && !superclass.equals(Object.class)) {
copyToInternal(source, destination, superclass, false);
}

2
ProtocolLib/src/main/java/com/comphenix/protocol/reflect/PrettyPrinter.java
View File

@ -210,7 +210,7 @@ public class PrettyPrinter {
ObjectPrinter printer) throws IllegalAccessException {
// See if we're supposed to skip this class
if (current == Object.class || (stop != null && current.equals(stop))) {
if (current == null || current == Object.class || (stop != null && current.equals(stop))) {
return;
}