mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 18:31:29 +01:00
30 lines
980 B
Diff
30 lines
980 B
Diff
--- a/net/minecraft/server/MerchantRecipe.java
|
|
+++ b/net/minecraft/server/MerchantRecipe.java
|
|
@@ -1,5 +1,7 @@
|
|
package net.minecraft.server;
|
|
|
|
+import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe; // CraftBukkit
|
|
+
|
|
public class MerchantRecipe {
|
|
|
|
public ItemStack buyingItem1;
|
|
@@ -8,6 +10,18 @@
|
|
public int uses;
|
|
public int maxUses;
|
|
public boolean rewardExp;
|
|
+ // CraftBukkit start
|
|
+ private CraftMerchantRecipe bukkitHandle;
|
|
+
|
|
+ public CraftMerchantRecipe asBukkit() {
|
|
+ return (bukkitHandle == null) ? bukkitHandle = new CraftMerchantRecipe(this) : bukkitHandle;
|
|
+ }
|
|
+
|
|
+ public MerchantRecipe(ItemStack itemstack, ItemStack itemstack1, ItemStack itemstack2, int i, int j, CraftMerchantRecipe bukkit) {
|
|
+ this(itemstack, itemstack1, itemstack2, i, j);
|
|
+ this.bukkitHandle = bukkit;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
|
|
public MerchantRecipe(NBTTagCompound nbttagcompound) {
|
|
this.buyingItem1 = ItemStack.a;
|