fix TradeTag#duplicate and usages of it

DenizenScript · Sep 15, 2021 · 5b0fac3 · 5b0fac3
1 parent a23a162
commit 5b0fac3
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/...main/java/com/denizenscript/denizen/paper/events/PlayerTradesWithMerchantScriptEvent.java b/...main/java/com/denizenscript/denizen/paper/events/PlayerTradesWithMerchantScriptEvent.java
@@ -81,7 +81,7 @@ public ObjectTag getContext(String name) {
             return new EntityTag(event.getVillager());
         }
         else if (name.equals("trade")) {
-            return new TradeTag(event.getTrade());
+            return new TradeTag(event.getTrade()).duplicate();
         }
         return super.getContext(name);
     }

diff --git a/...c/main/java/com/denizenscript/denizen/events/entity/VillagerAcquiresTradeScriptEvent.java b/...c/main/java/com/denizenscript/denizen/events/entity/VillagerAcquiresTradeScriptEvent.java
@@ -74,7 +74,7 @@ public ObjectTag getContext(String name) {
             return entity;
         }
         else if (name.equals("trade")) {
-            return new TradeTag(event.getRecipe());
+            return new TradeTag(event.getRecipe()).duplicate();
         }
         return super.getContext(name);
     }

diff --git a/...ain/java/com/denizenscript/denizen/events/entity/VillagerReplenishesTradeScriptEvent.java b/...ain/java/com/denizenscript/denizen/events/entity/VillagerReplenishesTradeScriptEvent.java
@@ -81,7 +81,7 @@ public ObjectTag getContext(String name) {
             case "entity":
                 return entity;
             case "trade":
-                return new TradeTag(event.getRecipe());
+                return new TradeTag(event.getRecipe()).duplicate();
             case "bonus":
                 return new ElementTag(event.getBonus());
         }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java
@@ -1500,7 +1500,7 @@ else if (obj instanceof EntityTag) {
         registerOnlineOnlyTag("selected_trade", (attribute, object) -> {
             Inventory playerInventory = object.getPlayerEntity().getOpenInventory().getTopInventory();
             if (playerInventory instanceof MerchantInventory && ((MerchantInventory) playerInventory).getSelectedRecipe() != null) {
-                return new TradeTag(((MerchantInventory) playerInventory).getSelectedRecipe());
+                return new TradeTag(((MerchantInventory) playerInventory).getSelectedRecipe()).duplicate();
             }
             return null;
         });

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/TradeTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/TradeTag.java
@@ -73,7 +73,9 @@ public TradeTag(MerchantRecipe recipe) {
 
     @Override
     public TradeTag duplicate() {
-        return new TradeTag(new MerchantRecipe(recipe.getResult(), recipe.getUses(), recipe.getMaxUses(), recipe.hasExperienceReward(), recipe.getVillagerExperience(), recipe.getPriceMultiplier()));
+        MerchantRecipe result = new MerchantRecipe(recipe.getResult(), recipe.getUses(), recipe.getMaxUses(), recipe.hasExperienceReward(), recipe.getVillagerExperience(), recipe.getPriceMultiplier());
+        result.setIngredients(recipe.getIngredients());
+        return new TradeTag(result);
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityTrades.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityTrades.java
@@ -37,7 +37,7 @@ public static EntityTrades getFrom(ObjectTag entity) {
     public ListTag getTradeRecipes() {
         ArrayList<TradeTag> recipes = new ArrayList<>();
         for (MerchantRecipe recipe : ((Merchant) entity.getBukkitEntity()).getRecipes()) {
-            recipes.add(new TradeTag(recipe));
+            recipes.add(new TradeTag(recipe).duplicate());
         }
         return new ListTag(recipes);
     }

diff --git a/...src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryTrades.java b/...src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryTrades.java
@@ -37,7 +37,7 @@ public InventoryTrades(InventoryTag inventory) {
     public ListTag getTradeRecipes() {
         ArrayList<TradeTag> recipes = new ArrayList<>();
         for (MerchantRecipe recipe : ((MerchantInventory) inventory.getInventory()).getMerchant().getRecipes()) {
-            recipes.add(new TradeTag(recipe));
+            recipes.add(new TradeTag(recipe).duplicate());
         }
         return new ListTag(recipes);
     }