summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-03-13 09:48:23 +1100
committermd_5 <git@md-5.net>2016-03-13 09:48:23 +1100
commit55a85357a6d5118fbb2d3117d596ae83aae34239 (patch)
tree8e87a3be3d0d02d3c4d9dbfc9233549ae36306c5 /src
parentcbebfa439fa1c7a261d19bc60796d62230ebf924 (diff)
downloadcraftbukkit-55a85357a6d5118fbb2d3117d596ae83aae34239.tar
craftbukkit-55a85357a6d5118fbb2d3117d596ae83aae34239.tar.gz
craftbukkit-55a85357a6d5118fbb2d3117d596ae83aae34239.tar.lz
craftbukkit-55a85357a6d5118fbb2d3117d596ae83aae34239.tar.xz
craftbukkit-55a85357a6d5118fbb2d3117d596ae83aae34239.zip
SPIGOT-1871: Fix wrong argument order in CraftMerchantRecipe
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java2
1 files changed, 1 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 0e029a95..9bf5f2f3 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java
@@ -19,9 +19,9 @@ public class CraftMerchantRecipe extends MerchantRecipe {
public CraftMerchantRecipe(ItemStack result, int uses, int maxUses, boolean experienceReward) {
super(result, uses, maxUses, experienceReward);
this.handle = new net.minecraft.server.MerchantRecipe(
- CraftItemStack.asNMSCopy(result),
null,
null,
+ CraftItemStack.asNMSCopy(result),
uses,
maxUses,
this