Catch NPEs in CustomNBT methods.

DenizenScript · Jul 3, 2013 · f492c17 · f492c17
1 parent 3443c82
commit f492c17
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/utilities/nbt/CustomNBT.java b/src/main/java/net/aufdemrand/denizen/utilities/nbt/CustomNBT.java
@@ -20,6 +20,7 @@ public static MapOfEnchantments getEnchantments(ItemStack item) {
      */
 
     public static boolean hasCustomNBT(ItemStack item, String key) {
+        if (item == null) return false;
         NBTTagCompound tag;
         net.minecraft.server.v1_6_R1.ItemStack cis = CraftItemStack.asNMSCopy(item);
         if (!cis.hasTag()) return false;
@@ -30,6 +31,7 @@ public static boolean hasCustomNBT(ItemStack item, String key) {
     }
 
     public static String getCustomNBT(ItemStack item, String key) {
+        if (item == null) return null;
         net.minecraft.server.v1_6_R1.ItemStack cis = CraftItemStack.asNMSCopy(item);
         NBTTagCompound tag;
         if (!cis.hasTag())
@@ -42,6 +44,7 @@ public static String getCustomNBT(ItemStack item, String key) {
     }
 
     public static ItemStack removeCustomNBT(ItemStack item, String key) {
+        if (item == null) return null;
         net.minecraft.server.v1_6_R1.ItemStack cis = CraftItemStack.asNMSCopy(item);
         NBTTagCompound tag;
         if (!cis.hasTag())
@@ -53,6 +56,7 @@ public static ItemStack removeCustomNBT(ItemStack item, String key) {
     }
 
     public static ItemStack addCustomNBT(ItemStack item, String key, String value) {
+        if (item == null) return null;
         net.minecraft.server.v1_6_R1.ItemStack cis = CraftItemStack.asNMSCopy(item);
         NBTTagCompound tag = null;
         // Do stuff with tag
@@ -64,6 +68,7 @@ public static ItemStack addCustomNBT(ItemStack item, String key, String value) {
     }
 
     public static LivingEntity addCustomNBT(LivingEntity entity, String key, String value) {
+        if (entity == null) return null;
         Entity bukkitEntity = entity;
         net.minecraft.server.v1_6_R1.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
         NBTTagCompound tag = new NBTTagCompound();
@@ -80,6 +85,7 @@ public static LivingEntity addCustomNBT(LivingEntity entity, String key, String
     }
 
     public static LivingEntity removeCustomNBT(LivingEntity entity, String key) {
+        if (entity == null) return null;
         Entity bukkitEntity = entity;
         net.minecraft.server.v1_6_R1.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
         NBTTagCompound tag = new NBTTagCompound();
@@ -96,6 +102,7 @@ public static LivingEntity removeCustomNBT(LivingEntity entity, String key) {
     }
 
     public static boolean hasCustomNBT(LivingEntity entity, String key) {
+        if (entity == null) return false;
         Entity bukkitEntity = entity;
         net.minecraft.server.v1_6_R1.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
         NBTTagCompound tag = new NBTTagCompound();
@@ -108,6 +115,7 @@ public static boolean hasCustomNBT(LivingEntity entity, String key) {
     }
 
     public static String getCustomNBT(LivingEntity entity, String key) {
+        if (entity == null) return null;
         Entity bukkitEntity = entity;
         net.minecraft.server.v1_6_R1.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle();
         NBTTagCompound tag = new NBTTagCompound();