From d08cf58d8012aca693ce04f05a3b01ad06305eaa Mon Sep 17 00:00:00 2001
From: Gabriel Harris-Rouquette <gabizou@me.com>
Date: Tue, 10 Nov 2015 11:46:49 -0800
Subject: [PATCH] Fix a possible NPE when checking supertypes of interfaces.
 Closes #2176.

Signed-off-by: Gabriel Harris-Rouquette <gabizou@me.com>
---
 .../java/net/minecraftforge/fml/common/registry/GameData.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/minecraftforge/fml/common/registry/GameData.java b/src/main/java/net/minecraftforge/fml/common/registry/GameData.java
index 9745f12575..514c08bd43 100644
--- a/src/main/java/net/minecraftforge/fml/common/registry/GameData.java
+++ b/src/main/java/net/minecraftforge/fml/common/registry/GameData.java
@@ -1010,7 +1010,7 @@ public class GameData {
             .put("minecraft:items", Item.class).build());
 
     private void findSuperTypes(Class<?> type, Set<Class<?>> types) {
-        if (type == Object.class) {
+        if (type == null || type == Object.class) {
             return;
         }
         types.add(type);