Check for ID mapping null

CitizensDev · Aug 5, 2013 · fd21956 · fd21956
1 parent 71863c9
commit fd21956
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/java/net/citizensnpcs/util/NMS.java b/src/main/java/net/citizensnpcs/util/NMS.java
@@ -118,10 +118,6 @@ public static void clearGoals(PathfinderGoalSelector... goalSelectors) {
         }
     }
 
-    public static void openHorseScreen(Horse horse, Player equipper) {
-        ((EntityHorse) getHandle(horse)).f((EntityHuman) NMS.getHandle(equipper));
-    }
-
     private static Constructor<?> getCustomEntityConstructor(Class<?> clazz, EntityType type) throws SecurityException,
             NoSuchMethodException {
         Constructor<?> constructor = ENTITY_CONSTRUCTOR_CACHE.get(clazz);
@@ -215,8 +211,12 @@ public static void mount(org.bukkit.entity.Entity entity, org.bukkit.entity.Enti
         NMS.getHandle(passenger).mount(NMS.getHandle(entity));
     }
 
+    public static void openHorseScreen(Horse horse, Player equipper) {
+        ((EntityHorse) getHandle(horse)).f((EntityHuman) NMS.getHandle(equipper));
+    }
+
     public static void registerEntityClass(Class<?> clazz) {
-        if (ENTITY_CLASS_TO_INT.containsKey(clazz))
+        if (ENTITY_CLASS_TO_INT == null || ENTITY_CLASS_TO_INT.containsKey(clazz))
             return;
         Class<?> search = clazz;
         while ((search = search.getSuperclass()) != null && Entity.class.isAssignableFrom(search)) {