Fix CITIZENS-480 (use IDs for item storage instead of Material names)

CitizensDev · Mar 11, 2013 · 30b6660 · 30b6660
1 parent ba76413
commit 30b6660
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/src/main/java/net/citizensnpcs/api/trait/trait/Equipment.java b/src/main/java/net/citizensnpcs/api/trait/trait/Equipment.java
@@ -71,12 +71,14 @@ public void load(DataKey key) throws NPCLoadException {
     @Override
     @SuppressWarnings("deprecation")
     public void onSpawn() {
+        if (!(npc.getBukkitEntity() instanceof LivingEntity))
+            return;
         if (npc.getBukkitEntity() instanceof Enderman) {
             Enderman enderman = (Enderman) npc.getBukkitEntity();
             if (equipment[0] != null)
                 enderman.setCarriedMaterial(equipment[0].getData());
         } else {
-            LivingEntity entity = npc.getBukkitEntity();
+            LivingEntity entity = (LivingEntity) npc.getBukkitEntity();
             EntityEquipment equip = getEquipmentFromEntity(entity);
             if (equipment[0] != null)
                 equip.setItemInHand(equipment[0]);
@@ -117,12 +119,14 @@ private void saveOrRemove(DataKey key, ItemStack item) {
      */
     @SuppressWarnings("deprecation")
     public void set(int slot, ItemStack item) {
+        if (!(npc.getBukkitEntity() instanceof LivingEntity))
+            return;
         if (npc.getBukkitEntity() instanceof Enderman) {
             if (slot != 0)
                 throw new UnsupportedOperationException("Slot can only be 0 for enderman");
             ((Enderman) npc.getBukkitEntity()).setCarriedMaterial(item.getData());
         } else {
-            EntityEquipment equip = getEquipmentFromEntity(npc.getBukkitEntity());
+            EntityEquipment equip = getEquipmentFromEntity((LivingEntity) npc.getBukkitEntity());
             switch (slot) {
                 case 0:
                     equip.setItemInHand(item);

diff --git a/src/main/java/net/citizensnpcs/api/util/DataKey.java b/src/main/java/net/citizensnpcs/api/util/DataKey.java
@@ -17,7 +17,7 @@ protected String createRelativeKey(String from) {
             return path;
         if (from.charAt(0) == '.')
             return path.isEmpty() ? from.substring(1, from.length()) : path + from;
-        return path.isEmpty() ? from : path + "." + from;
+        return path.isEmpty() ? from : path + '.' + from;
     }
 
     @Override

diff --git a/src/main/java/net/citizensnpcs/api/util/ItemStorage.java b/src/main/java/net/citizensnpcs/api/util/ItemStorage.java
@@ -121,10 +121,20 @@ private static <T extends ItemMeta> T ensureMeta(ItemStack stack) {
     }
 
     public static ItemStack loadItemStack(DataKey root) {
-        Material matched = Material.matchMaterial(root.getString("type", root.getString("id")));
-        if (matched == null)
+        String raw = root.getString("type", root.getString("id"));
+        if (raw == null || raw.length() == 0)
             return null;
-        ItemStack res = new ItemStack(matched, root.getInt("amount"), (short) (root.getInt("durability",
+        int id = -1;
+        try {
+            id = Integer.parseInt(raw);
+        } catch (NumberFormatException ex) {
+            Material match = Material.matchMaterial(root.getString("type", root.getString("id")));
+            if (match != null)
+                id = match.getId();
+        }
+        if (id <= 0)
+            return null;
+        ItemStack res = new ItemStack(id, root.getInt("amount"), (short) (root.getInt("durability",
                 root.getInt("data", 0))));
         if (root.keyExists("mdata") && res.getData() != null) {
             res.getData().setData((byte) root.getInt("mdata"));
@@ -147,8 +157,7 @@ public static void saveItem(DataKey key, ItemStack item) {
         if (item == null)
             return;
         migrateForSave(key);
-        String type = item.getType() == null ? Material.AIR.name() : item.getType().name();
-        key.setString("type", type);
+        key.setInt("type", item.getTypeId());
         key.setInt("amount", item.getAmount());
         key.setInt("durability", item.getDurability());
         if (item.getData() != null) {