fix nbt issue in get and set methods for nms

hakan-krgn · Nov 2, 2023 · 04046ca · 04046ca
1 parent 5cc2cfa
commit 04046ca
Showing 1 changed file with 25 additions and 9 deletions.
diff --git a/hCore-bukkit/nms/v1_20_R2/src/main/java/com/hakan/core/item/nbt/NbtManager_v1_20_R2.java b/hCore-bukkit/nms/v1_20_R2/src/main/java/com/hakan/core/item/nbt/NbtManager_v1_20_R2.java
@@ -28,9 +28,13 @@ public ItemStack set(@Nonnull ItemStack itemStack, @Nonnull String key, @Nonnull
         if (itemStack.getType().equals(Material.AIR))
             return itemStack;
 
-        net.minecraft.world.item.ItemStack nmsCopy = CraftItemStack.asNMSCopy(itemStack);
-        nmsCopy.w().a(key, value);
-        return CraftItemStack.asBukkitCopy(nmsCopy);
+        try {
+            net.minecraft.world.item.ItemStack nmsCopy = CraftItemStack.asNMSCopy(itemStack);
+            nmsCopy.w().a(key, value);
+            return CraftItemStack.asBukkitCopy(nmsCopy);
+        } catch (Exception e) {
+            return itemStack;
+        }
     }
 
     /**
@@ -45,9 +49,13 @@ public ItemStack set(@Nonnull ItemStack itemStack, @Nonnull String nbt) {
         if (itemStack.getType().equals(Material.AIR))
             return itemStack;
 
-        net.minecraft.world.item.ItemStack nmsCopy = CraftItemStack.asNMSCopy(itemStack);
-        nmsCopy.w().a(this.parse(nbt));
-        return CraftItemStack.asBukkitCopy(nmsCopy);
+        try {
+            net.minecraft.world.item.ItemStack nmsCopy = CraftItemStack.asNMSCopy(itemStack);
+            nmsCopy.w().a(this.parse(nbt));
+            return CraftItemStack.asBukkitCopy(nmsCopy);
+        } catch (Exception e) {
+            return itemStack;
+        }
     }
 
     /**
@@ -63,8 +71,12 @@ public String get(@Nonnull ItemStack itemStack, @Nonnull String key) {
         if (nmsCopy == null)
             return "{}";
 
-        NBTTagCompound nbtTagCompound = nmsCopy.w();
-        return nbtTagCompound.e(key) ? nbtTagCompound.l(key) : "{}";
+        try {
+            NBTTagCompound nbtTagCompound = nmsCopy.w();
+            return nbtTagCompound.e(key) ? nbtTagCompound.l(key) : "{}";
+        } catch (Exception e) {
+            return "{}";
+        }
     }
 
     /**
@@ -79,7 +91,11 @@ public String get(@Nonnull ItemStack itemStack) {
         if (nmsCopy == null)
             return "{}";
 
-        return nmsCopy.w().toString();
+        try {
+            return nmsCopy.w().toString();
+        } catch (Exception e) {
+            return "{}";
+        }
     }
 
     private NBTTagCompound parse(String nbt) {