SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.14-pre5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
paper-server/nms-patches/MerchantRecipe.patch
View File

@@ -8,10 +8,10 @@
public class MerchantRecipe {
public ItemStack buyingItem1;
@@ -8,6 +10,18 @@
public int uses;
public int maxUses;
public boolean rewardExp;
@@ -12,6 +14,18 @@
private int h;
public float priceMultiplier;
public int xp;
+ // CraftBukkit start
+ private CraftMerchantRecipe bukkitHandle;
+
@@ -19,11 +19,11 @@
+ 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);
+ public MerchantRecipe(ItemStack itemstack, ItemStack itemstack1, ItemStack itemstack2, int uses, int maxUses, int experience, float priceMultiplier, CraftMerchantRecipe bukkit) {
+ this(itemstack, itemstack1, itemstack2, uses, maxUses, experience, priceMultiplier);
+ this.bukkitHandle = bukkit;
+ }
+ // CraftBukkit end
public MerchantRecipe(NBTTagCompound nbttagcompound) {
this.buyingItem1 = ItemStack.a;
this.rewardExp = true;