Update to Minecraft 1.9

By: md_5 <git@md-5.net>
2016-03-01 08:32:46 +11:00
parent 2da480a9c8
commit 21d4bf5d1f
305 changed files with 6684 additions and 6105 deletions
--- a/paper-server/nms-patches/MerchantRecipe.patch
+++ b/paper-server/nms-patches/MerchantRecipe.patch
@@ -0,0 +1,29 @@
+--- 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;
+
+ 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.a(nbttagcompound);