'icon-data' field in skill indicator now determines CustomModelData

Sentropic · Sep 22, 2020 · 50fb1cd · 50fb1cd
1 parent 88cdfd2
commit 50fb1cd
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/main/java/com/sucy/skill/api/util/Data.java b/src/main/java/com/sucy/skill/api/util/Data.java
@@ -31,6 +31,7 @@
 import org.apache.commons.lang.ObjectUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
+import org.bukkit.entity.Item;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.material.MaterialData;
@@ -82,11 +83,8 @@ private static ItemStack parse(final String mat, final short dur, final int data
     public static void serializeIcon(ItemStack item, DataSection config) {
         config.set(MAT, item.getType().name());
         config.set(DURABILITY, item.getDurability());
-        int cmd = 0;
-        try {
-            cmd = item.getItemMeta().getCustomModelData();
-        } catch (NullPointerException ignored) {}
-        config.set(DATA, cmd);
+        ItemMeta meta = item.getItemMeta();
+        config.set(DATA, meta.hasCustomModelData() ? meta.getCustomModelData() : 0);
 
         if (item.hasItemMeta() && item.getItemMeta().hasDisplayName()) {
             List<String> lore = item.getItemMeta().getLore();