Merge pull request #976 from KKiiya/develop

Fixed tag apply for VersionSupport#setShopUpgradeIdentifier
andrei1058 · Jun 3, 2024 · 66a831d · 66a831d
2 parents c23cbb6 + dc86f60
commit 66a831d
Show file tree

Hide file tree

Showing 5 changed files with 15 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
@@ -548,9 +548,10 @@ public org.bukkit.inventory.ItemStack setShopUpgradeIdentifier(org.bukkit.invent
         NBTTagCompound tag = i.getTag();
         if (tag == null) {
             tag = new NBTTagCompound();
-            i.setTag(tag);
         }
-        tag.setString("tierIdentifier", identifier);
+
+        tag.setString(VersionSupport.PLUGIN_TAG_TIER_KEY, identifier);
+        i.setTag(tag);
         return CraftItemStack.asBukkitCopy(i);
     }
 

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
@@ -602,9 +602,10 @@ public org.bukkit.inventory.ItemStack setShopUpgradeIdentifier(org.bukkit.invent
         NBTTagCompound tag = i.getTag();
         if (tag == null) {
             tag = new NBTTagCompound();
-            i.setTag(tag);
         }
-        tag.setString("tierIdentifier", identifier);
+
+        tag.setString(VersionSupport.PLUGIN_TAG_TIER_KEY, identifier);
+        i.setTag(tag);
         return CraftItemStack.asBukkitCopy(i);
     }
 

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
@@ -533,9 +533,10 @@ public org.bukkit.inventory.ItemStack setShopUpgradeIdentifier(org.bukkit.invent
         NBTTagCompound tag = i.getTag();
         if (tag == null) {
             tag = new NBTTagCompound();
-            i.setTag(tag);
         }
-        tag.setString("tierIdentifier", identifier);
+
+        tag.setString(VersionSupport.PLUGIN_TAG_TIER_KEY, identifier);
+        i.setTag(tag);
         return CraftItemStack.asBukkitCopy(i);
     }
 

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
@@ -563,9 +563,10 @@ public org.bukkit.inventory.ItemStack setShopUpgradeIdentifier(org.bukkit.invent
         NBTTagCompound tag = i.getTag();
         if (tag == null) {
             tag = new NBTTagCompound();
-            i.setTag(tag);
         }
-        tag.setString("tierIdentifier", identifier);
+
+        tag.setString(VersionSupport.PLUGIN_TAG_TIER_KEY, identifier);
+        i.setTag(tag);
         return CraftItemStack.asBukkitCopy(i);
     }
 

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
@@ -543,9 +543,10 @@ public org.bukkit.inventory.ItemStack setShopUpgradeIdentifier(org.bukkit.invent
         NBTTagCompound tag = i.t();
         if (tag == null) {
             tag = new NBTTagCompound();
-            i.c(tag);
         }
-        tag.a("tierIdentifier", identifier);
+
+        tag.a(VersionSupport.PLUGIN_TAG_TIER_KEY, identifier);
+        i.c(tag);
         return CraftItemStack.asBukkitCopy(i);
     }