Update to Minecraft 1.9

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-03-01 08:32:46 +11:00
parent 2da480a9c8
commit 21d4bf5d1f
305 changed files with 6684 additions and 6105 deletions

View File

@@ -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 {