Minecraft 1.9.4

By: md_5 <git@md-5.net>
2016-05-10 21:47:39 +10:00
parent c9a6e9175c
commit d506c12c07
236 changed files with 1471 additions and 1822 deletions
--- a/paper-server/nms-patches/MerchantRecipe.patch
+++ b/paper-server/nms-patches/MerchantRecipe.patch
@@ -1,14 +1,14 @@
 --- a/net/minecraft/server/MerchantRecipe.java
 +++ b/net/minecraft/server/MerchantRecipe.java
-@@ -1,5 +1,7 @@
+@@ -1,6 +1,7 @@
 package net.minecraft.server;
 
-+import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe;
-+
+ import javax.annotation.Nullable;
+import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe; // CraftBukkit
+ 
 public class MerchantRecipe {
 
-     public ItemStack buyingItem1;
-@@ -8,6 +10,18 @@
+@@ -10,6 +11,18 @@
     public int uses;
     public int maxUses;
     public boolean rewardExp;