Fixed tag apply (#969)

* add 1.20.4 support (#949) add 1.20.4 support * Fixed tag apply Fixed tag apply for 1.18.2, 1.17.1, 1.12.2 and 1.8.8 where the tag wouldnt get applied ever (because the NBTTag was getting applied only if the item was null with no additive tags) --------- Co-authored-by: Andrei Dascălu <[email protected]>
andrei1058 · Feb 3, 2024 · f4226f6 · f4226f6
1 parent f59e3ce
commit f4226f6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/...pport_1_12_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_12_R1/v1_12_R1.java b/...pport_1_12_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_12_R1/v1_12_R1.java
@@ -377,10 +377,10 @@ public org.bukkit.inventory.ItemStack addCustomData(org.bukkit.inventory.ItemSta
         NBTTagCompound tag = itemStack.getTag();
         if (tag == null) {
             tag = new NBTTagCompound();
-            itemStack.setTag(tag);
         }
 
         tag.setString("BedWars1058", data);
+        itemStack.setTag(tag);
         return CraftItemStack.asBukkitCopy(itemStack);
     }
 
@@ -390,10 +390,10 @@ public org.bukkit.inventory.ItemStack setTag(org.bukkit.inventory.ItemStack i, S
         NBTTagCompound tag = itemStack.getTag();
         if (tag == null) {
             tag = new NBTTagCompound();
-            itemStack.setTag(tag);
         }
 
         tag.setString(key, value);
+        itemStack.setTag(tag);
         return CraftItemStack.asBukkitCopy(itemStack);
     }
 

diff --git a/...nsupport_1_8_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_8_R3/v1_8_R3.java b/...nsupport_1_8_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_8_R3/v1_8_R3.java
@@ -418,10 +418,10 @@ public org.bukkit.inventory.ItemStack addCustomData(org.bukkit.inventory.ItemSta
         NBTTagCompound tag = itemStack.getTag();
         if (tag == null) {
             tag = new NBTTagCompound();
-            itemStack.setTag(tag);
         }
 
         tag.setString("BedWars1058", data);
+        itemStack.setTag(tag);
         return CraftItemStack.asBukkitCopy(itemStack);
     }
 
@@ -431,10 +431,10 @@ public ItemStack setTag(ItemStack itemStack, String key, String value) {
         NBTTagCompound tag = is.getTag();
         if (tag == null) {
             tag = new NBTTagCompound();
-            is.setTag(tag);
         }
 
         tag.setString(key, value);
+        is.setTag(tag);
         return CraftItemStack.asBukkitCopy(is);
     }
 

diff --git a/...port_v1_16_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_16_R3/v1_16_R3.java b/...port_v1_16_R3/src/main/java/com/andrei1058/bedwars/support/version/v1_16_R3/v1_16_R3.java
@@ -381,10 +381,10 @@ public org.bukkit.inventory.ItemStack addCustomData(org.bukkit.inventory.ItemSta
         NBTTagCompound tag = itemStack.getTag();
         if (tag == null) {
             tag = new NBTTagCompound();
-            itemStack.setTag(tag);
         }
 
         tag.setString("BedWars1058", data);
+        itemStack.setTag(tag);
         return CraftItemStack.asBukkitCopy(itemStack);
     }
 
@@ -394,10 +394,10 @@ public org.bukkit.inventory.ItemStack setTag(org.bukkit.inventory.ItemStack item
         NBTTagCompound tag = is.getTag();
         if (tag == null) {
             tag = new NBTTagCompound();
-            is.setTag(tag);
         }
 
         tag.setString(key, value);
+        is.setTag(tag);
         return CraftItemStack.asBukkitCopy(is);
     }
 

diff --git a/...port_v1_17_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_17_R1/v1_17_R1.java b/...port_v1_17_R1/src/main/java/com/andrei1058/bedwars/support/version/v1_17_R1/v1_17_R1.java
@@ -411,10 +411,10 @@ public org.bukkit.inventory.ItemStack addCustomData(org.bukkit.inventory.ItemSta
         NBTTagCompound tag = itemStack.getTag();
         if (tag == null) {
             tag = new NBTTagCompound();
-            itemStack.setTag(tag);
         }
 
         tag.setString("BedWars1058", data);
+        itemStack.setTag(tag);
         return CraftItemStack.asBukkitCopy(itemStack);
     }
 
@@ -424,10 +424,10 @@ public org.bukkit.inventory.ItemStack setTag(org.bukkit.inventory.ItemStack item
         NBTTagCompound tag = is.getTag();
         if (tag == null) {
             tag = new NBTTagCompound();
-            is.setTag(tag);
         }
 
         tag.setString(key, value);
+        is.setTag(tag);
         return CraftItemStack.asBukkitCopy(is);
     }
 

diff --git a/...port_v1_18_R2/src/main/java/com/andrei1058/bedwars/support/version/v1_18_R2/v1_18_R2.java b/...port_v1_18_R2/src/main/java/com/andrei1058/bedwars/support/version/v1_18_R2/v1_18_R2.java
@@ -391,10 +391,10 @@ public org.bukkit.inventory.ItemStack addCustomData(org.bukkit.inventory.ItemSta
         NBTTagCompound tag = itemStack.t();
         if (tag == null) {
             tag = new NBTTagCompound();
-            itemStack.c(tag);
         }
 
         tag.a("BedWars1058", data);
+        itemStack.c(tag);
         return CraftItemStack.asBukkitCopy(itemStack);
     }
 
@@ -404,10 +404,10 @@ public org.bukkit.inventory.ItemStack setTag(org.bukkit.inventory.ItemStack item
         NBTTagCompound tag = is.t();
         if (tag == null) {
             tag = new NBTTagCompound();
-            is.c(tag);
         }
 
         tag.a(key, value);
+        is.c(tag);
         return CraftItemStack.asBukkitCopy(is);
     }