**2.0**

* Fixed visit item icons generating while a shop has no shop item causing errors Signed-off-by: XZot1K <[email protected]>
BalkerCraft · Jan 20, 2024 · 5711e39 · 5711e39
1 parent a01b7eb
commit 5711e39
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 24 deletions.
diff --git a/Core/pom.xml b/Core/pom.xml
@@ -68,6 +68,14 @@
                                     <pattern>org.intellij</pattern>
                                     <shadedPattern>xzot1k.plugins.ds.org.intellij</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>net.wesjd.anvilgui</pattern>
+                                    <shadedPattern>xzot1k.plugins.ds.anvilgui</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.google.code.gson</pattern>
+                                    <shadedPattern>xzot1k.plugins.ds.gson</shadedPattern>
+                                </relocation>
                             </relocations>
 
                             <filters>

diff --git a/Core/src/main/java/xzot1k/plugins/ds/core/tasks/VisitItemTask.java b/Core/src/main/java/xzot1k/plugins/ds/core/tasks/VisitItemTask.java
@@ -80,8 +80,11 @@ public void run() {
 
     private ItemStack buildItem(@NotNull Shop shop) {
         final LocationClone location = shop.getBaseLocation();
-        ItemStack itemStack = INSTANCE.updateNBT(new ItemStack(shop.getShopItem().getType(), 1,
-                shop.getShopItem().getDurability()), "currentShop-id", shop.getShopId().toString());
+
+        ItemStack shopItemClone = shop.getShopItem().clone();
+        shopItemClone.setAmount(1);
+
+        ItemStack itemStack = INSTANCE.updateNBT(shopItemClone, "currentShop-id", shop.getShopId().toString());
         ItemMeta itemMeta = itemStack.getItemMeta();
         if (itemMeta != null) {
             itemMeta.addItemFlags(ItemFlag.values());

diff --git a/v1_20_r3.iml b/v1_20_r3.iml
diff --git a/v1_20_r3/v1_20_r3.iml b/v1_20_r3/v1_20_r3.iml
@@ -4,11 +4,12 @@
     <facet type="minecraft" name="Minecraft">
       <configuration>
         <autoDetectTypes>
+          <platformType>MCP</platformType>
+          <platformType>SPIGOT</platformType>
           <platformType>BUNGEECORD</platformType>
           <platformType>BUKKIT</platformType>
           <platformType>PAPER</platformType>
           <platformType>ADVENTURE</platformType>
-          <platformType>SPIGOT</platformType>
         </autoDetectTypes>
         <projectReimportVersion>1</projectReimportVersion>
       </configuration>