summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-11-18 09:20:14 +1100
committermd_5 <git@md-5.net>2016-11-18 09:20:14 +1100
commita0269d8e72ceb6d58e4ebfd3ba19998155e06c60 (patch)
tree1db40013f6ca18f4ac2e37ecfb8476c44d037f9f /nms-patches
parentb2f82f0f7f2e3d62a9f5511d0e19974ea9410dfd (diff)
downloadcraftbukkit-a0269d8e72ceb6d58e4ebfd3ba19998155e06c60.tar
craftbukkit-a0269d8e72ceb6d58e4ebfd3ba19998155e06c60.tar.gz
craftbukkit-a0269d8e72ceb6d58e4ebfd3ba19998155e06c60.tar.lz
craftbukkit-a0269d8e72ceb6d58e4ebfd3ba19998155e06c60.tar.xz
craftbukkit-a0269d8e72ceb6d58e4ebfd3ba19998155e06c60.zip
SPIGOT-2784: Fix Withers not being built
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/ItemStack.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/nms-patches/ItemStack.patch b/nms-patches/ItemStack.patch
index cf740c5a..875a90e9 100644
--- a/nms-patches/ItemStack.patch
+++ b/nms-patches/ItemStack.patch
@@ -173,14 +173,14 @@
+
+ // Special case juke boxes as they update their tile entity. Copied from ItemRecord.
+ // PAIL: checkme on updates.
-+ if (this.getItem() instanceof ItemRecord) {
++ if (this.item instanceof ItemRecord) {
+ ((BlockJukeBox) Blocks.JUKEBOX).a(world, blockposition, world.getType(blockposition), this);
+ world.a((EntityHuman) null, 1010, blockposition, Item.getId(this.item));
+ this.subtract(1);
+ entityhuman.b(StatisticList.Z);
+ }
+
-+ if (this.getItem() == Items.SKULL) { // Special case skulls to allow wither spawns to be cancelled
++ if (this.item == Items.SKULL) { // Special case skulls to allow wither spawns to be cancelled
+ BlockPosition bp = blockposition;
+ if (!world.getType(blockposition).getBlock().a(world, blockposition)) {
+ if (!world.getType(blockposition).getMaterial().isBuildable()) {
@@ -198,8 +198,8 @@
+ }
+
+ // SPIGOT-1288 - play sound stripped from ItemBlock
-+ if (this.getItem() instanceof ItemBlock) {
-+ SoundEffectType soundeffecttype = ((ItemBlock) this.getItem()).getBlock().getStepSound();
++ if (this.item instanceof ItemBlock) {
++ SoundEffectType soundeffecttype = ((ItemBlock) this.item).getBlock().getStepSound();
+ world.a(entityhuman, blockposition, soundeffecttype.e(), SoundCategory.BLOCKS, (soundeffecttype.a() + 1.0F) / 2.0F, soundeffecttype.b() * 0.8F);
+ }
+