From aa008dff0f9bedbe88e1fe79831776b0a52eb90a Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 1 Mar 2016 08:32:46 +1100
Subject: Update to Minecraft 1.9

---
 nms-patches/ItemRecord.patch | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'nms-patches/ItemRecord.patch')

diff --git a/nms-patches/ItemRecord.patch b/nms-patches/ItemRecord.patch
index 0698a9df..ef571447 100644
--- a/nms-patches/ItemRecord.patch
+++ b/nms-patches/ItemRecord.patch
@@ -1,17 +1,10 @@
 --- a/net/minecraft/server/ItemRecord.java
 +++ b/net/minecraft/server/ItemRecord.java
-@@ -22,10 +22,14 @@
-             if (world.isClientSide) {
-                 return true;
-             } else {
-+                // CraftBukkit Start
-+                /*
+@@ -22,6 +22,7 @@
+ 
+         if (iblockdata.getBlock() == Blocks.JUKEBOX && !((Boolean) iblockdata.get(BlockJukeBox.HAS_RECORD)).booleanValue()) {
+             if (!world.isClientSide) {
++                if (true) return EnumInteractionResult.SUCCESS; // CraftBukkit - handled in ItemStack
                  ((BlockJukeBox) Blocks.JUKEBOX).a(world, blockposition, iblockdata, itemstack);
-                 world.a((EntityHuman) null, 1005, blockposition, Item.getId(this));
+                 world.a((EntityHuman) null, 1010, blockposition, Item.getId(this));
                  --itemstack.count;
-                 entityhuman.b(StatisticList.X);
-+                */
-+                // CraftBukkit End
-                 return true;
-             }
-         } else {
-- 
cgit v1.2.3