diff options
| author | md_5 <git@md-5.net> | 2016-03-01 14:13:42 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-03-01 14:13:42 +1100 |
| commit | 32587ed8e7e349f7f4d374541a2de9a7982f33d3 (patch) | |
| tree | 38a25464791a2e6a931faaf7bf453c50d4413e60 | |
| parent | 41c02c0efd496a2d5c8cdf943dab4cc113fe68c5 (diff) | |
| download | craftbukkit-32587ed8e7e349f7f4d374541a2de9a7982f33d3.tar craftbukkit-32587ed8e7e349f7f4d374541a2de9a7982f33d3.tar.gz craftbukkit-32587ed8e7e349f7f4d374541a2de9a7982f33d3.tar.lz craftbukkit-32587ed8e7e349f7f4d374541a2de9a7982f33d3.tar.xz craftbukkit-32587ed8e7e349f7f4d374541a2de9a7982f33d3.zip | |
SPIGOT-1545: Populate Vanilla villager trades correctly.
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java index 964f7080..0e029a95 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java @@ -10,8 +10,10 @@ public class CraftMerchantRecipe extends MerchantRecipe { private final net.minecraft.server.MerchantRecipe handle; public CraftMerchantRecipe(net.minecraft.server.MerchantRecipe merchantRecipe) { - super(null, 0); + super(CraftItemStack.asBukkitCopy(merchantRecipe.sellingItem), 0); this.handle = merchantRecipe; + addIngredient(CraftItemStack.asBukkitCopy(merchantRecipe.buyingItem1)); + addIngredient(CraftItemStack.asBukkitCopy(merchantRecipe.buyingItem2)); } public CraftMerchantRecipe(ItemStack result, int uses, int maxUses, boolean experienceReward) { |