diff options
| author | md_5 <git@md-5.net> | 2016-03-01 08:32:46 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-03-01 09:32:45 +1100 |
| commit | aa008dff0f9bedbe88e1fe79831776b0a52eb90a (patch) | |
| tree | cb520e0f4cc5d683fb9b7fb95de37480a7443dfb /nms-patches/BlockButtonAbstract.patch | |
| parent | e1ebe524a78e27f6a2829ed4574fded3779094e1 (diff) | |
| download | craftbukkit-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/BlockButtonAbstract.patch')
| -rw-r--r-- | nms-patches/BlockButtonAbstract.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nms-patches/BlockButtonAbstract.patch b/nms-patches/BlockButtonAbstract.patch index 408baab4..27e38ee5 100644 --- a/nms-patches/BlockButtonAbstract.patch +++ b/nms-patches/BlockButtonAbstract.patch @@ -9,10 +9,10 @@ +import org.bukkit.event.entity.EntityInteractEvent; +// CraftBukkit end + - public abstract class BlockButtonAbstract extends Block { + public abstract class BlockButtonAbstract extends BlockDirectional { - public static final BlockStateDirection FACING = BlockStateDirection.of("facing"); -@@ -124,6 +129,19 @@ + public static final BlockStateBoolean POWERED = BlockStateBoolean.of("powered"); +@@ -121,6 +126,19 @@ if (((Boolean) iblockdata.get(BlockButtonAbstract.POWERED)).booleanValue()) { return true; } else { @@ -31,10 +31,10 @@ + // CraftBukkit end world.setTypeAndData(blockposition, iblockdata.set(BlockButtonAbstract.POWERED, Boolean.valueOf(true)), 3); world.b(blockposition, blockposition); - world.makeSound((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D, "random.click", 0.3F, 0.6F); -@@ -161,6 +179,16 @@ - if (this.N) { - this.f(world, blockposition, iblockdata); + this.a(entityhuman, world, blockposition); +@@ -162,6 +180,16 @@ + if (this.I) { + this.e(iblockdata, world, blockposition); } else { + // CraftBukkit start + org.bukkit.block.Block block = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); @@ -48,8 +48,8 @@ + // CraftBukkit end world.setTypeUpdate(blockposition, iblockdata.set(BlockButtonAbstract.POWERED, Boolean.valueOf(false))); this.c(world, blockposition, (EnumDirection) iblockdata.get(BlockButtonAbstract.FACING)); - world.makeSound((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D, "random.click", 0.3F, 0.5F); -@@ -195,7 +223,41 @@ + this.b(world, blockposition); +@@ -187,7 +215,41 @@ boolean flag = !list.isEmpty(); boolean flag1 = ((Boolean) iblockdata.get(BlockButtonAbstract.POWERED)).booleanValue(); @@ -91,7 +91,7 @@ world.setTypeUpdate(blockposition, iblockdata.set(BlockButtonAbstract.POWERED, Boolean.valueOf(true))); this.c(world, blockposition, (EnumDirection) iblockdata.get(BlockButtonAbstract.FACING)); world.b(blockposition, blockposition); -@@ -203,6 +265,16 @@ +@@ -195,6 +257,16 @@ } if (!flag && flag1) { |