summaryrefslogtreecommitdiffstats
path: root/nms-patches/MerchantRecipe.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/MerchantRecipe.patch')
-rw-r--r--nms-patches/MerchantRecipe.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/nms-patches/MerchantRecipe.patch b/nms-patches/MerchantRecipe.patch
index 7a85d094..176a59b2 100644
--- a/nms-patches/MerchantRecipe.patch
+++ b/nms-patches/MerchantRecipe.patch
@@ -1,14 +1,14 @@
--- a/net/minecraft/server/MerchantRecipe.java
+++ b/net/minecraft/server/MerchantRecipe.java
-@@ -1,6 +1,7 @@
+@@ -1,5 +1,7 @@
package net.minecraft.server;
- import javax.annotation.Nullable;
+import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe; // CraftBukkit
-
++
public class MerchantRecipe {
-@@ -10,6 +11,18 @@
+ public ItemStack buyingItem1;
+@@ -8,6 +10,18 @@
public int uses;
public int maxUses;
public boolean rewardExp;
@@ -26,4 +26,4 @@
+ // CraftBukkit end
public MerchantRecipe(NBTTagCompound nbttagcompound) {
- this.a(nbttagcompound);
+ this.buyingItem1 = ItemStack.a;