summaryrefslogtreecommitdiffstats
path: root/nms-patches/ItemRecord.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-03-01 08:32:46 +1100
committermd_5 <git@md-5.net>2016-03-01 09:32:45 +1100
commitaa008dff0f9bedbe88e1fe79831776b0a52eb90a (patch)
treecb520e0f4cc5d683fb9b7fb95de37480a7443dfb /nms-patches/ItemRecord.patch
parente1ebe524a78e27f6a2829ed4574fded3779094e1 (diff)
downloadcraftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar
craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.gz
craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.lz
craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.xz
craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.zip
Update to Minecraft 1.9
Diffstat (limited to 'nms-patches/ItemRecord.patch')
-rw-r--r--nms-patches/ItemRecord.patch19
1 files changed, 6 insertions, 13 deletions
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 {