2015-02-26 23:41:06 +01:00
|
|
|
--- /home/matt/mc-dev-private//net/minecraft/server/BlockButtonAbstract.java 2015-02-26 22:40:22.035608145 +0000
|
|
|
|
+++ src/main/java/net/minecraft/server/BlockButtonAbstract.java 2015-02-26 22:40:22.039608145 +0000
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -3,6 +3,11 @@
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.Random;
|
|
|
|
|
|
|
|
+// CraftBukkit start
|
|
|
|
+import org.bukkit.event.block.BlockRedstoneEvent;
|
|
|
|
+import org.bukkit.event.entity.EntityInteractEvent;
|
|
|
|
+// CraftBukkit end
|
|
|
|
+
|
|
|
|
public abstract class BlockButtonAbstract extends Block {
|
|
|
|
|
|
|
|
public static final BlockStateDirection FACING = BlockStateDirection.of("facing");
|
2015-02-26 23:41:06 +01:00
|
|
|
@@ -124,6 +129,19 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
if (((Boolean) iblockdata.get(BlockButtonAbstract.POWERED)).booleanValue()) {
|
|
|
|
return true;
|
|
|
|
} else {
|
|
|
|
+ // CraftBukkit start
|
|
|
|
+ boolean powered = ((Boolean) iblockdata.get(POWERED));
|
|
|
|
+ org.bukkit.block.Block block = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
|
|
+ int old = (powered) ? 15 : 0;
|
|
|
|
+ int current = (!powered) ? 15 : 0;
|
|
|
|
+
|
|
|
|
+ BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, old, current);
|
|
|
|
+ world.getServer().getPluginManager().callEvent(eventRedstone);
|
|
|
|
+
|
|
|
|
+ if ((eventRedstone.getNewCurrent() > 0) != (!powered)) {
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+ // 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);
|
2015-02-26 23:41:06 +01:00
|
|
|
@@ -161,6 +179,16 @@
|
|
|
|
if (this.N) {
|
2014-11-25 22:32:16 +01:00
|
|
|
this.f(world, blockposition, iblockdata);
|
|
|
|
} else {
|
|
|
|
+ // CraftBukkit start
|
|
|
|
+ org.bukkit.block.Block block = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
|
|
+
|
|
|
|
+ BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, 15, 0);
|
|
|
|
+ world.getServer().getPluginManager().callEvent(eventRedstone);
|
|
|
|
+
|
|
|
|
+ if (eventRedstone.getNewCurrent() > 0) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
|
|
|
world.setTypeUpdate(blockposition, iblockdata.set(BlockButtonAbstract.POWERED, Boolean.valueOf(false)));
|
2015-02-26 23:41:06 +01:00
|
|
|
this.c(world, blockposition, (EnumDirection) iblockdata.get(BlockButtonAbstract.FACING));
|
2014-11-25 22:32:16 +01:00
|
|
|
world.makeSound((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D, "random.click", 0.3F, 0.5F);
|
2015-02-26 23:41:06 +01:00
|
|
|
@@ -195,7 +223,41 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
boolean flag = !list.isEmpty();
|
|
|
|
boolean flag1 = ((Boolean) iblockdata.get(BlockButtonAbstract.POWERED)).booleanValue();
|
2015-02-26 23:41:06 +01:00
|
|
|
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit start - Call interact event when arrows turn on wooden buttons
|
|
|
|
+ if (flag1 != flag && flag) {
|
|
|
|
+ org.bukkit.block.Block block = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
|
|
+ boolean allowed = false;
|
|
|
|
+
|
|
|
|
+ // If all of the events are cancelled block the button press, else allow
|
|
|
|
+ for (Object object : list) {
|
|
|
|
+ if (object != null) {
|
|
|
|
+ EntityInteractEvent event = new EntityInteractEvent(((Entity) object).getBukkitEntity(), block);
|
|
|
|
+ world.getServer().getPluginManager().callEvent(event);
|
|
|
|
+
|
|
|
|
+ if (!event.isCancelled()) {
|
|
|
|
+ allowed = true;
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (!allowed) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
2015-02-26 23:41:06 +01:00
|
|
|
+
|
2014-11-25 22:32:16 +01:00
|
|
|
if (flag && !flag1) {
|
|
|
|
+ // CraftBukkit start
|
|
|
|
+ org.bukkit.block.Block block = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
|
|
+
|
|
|
|
+ BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, 0, 15);
|
|
|
|
+ world.getServer().getPluginManager().callEvent(eventRedstone);
|
|
|
|
+
|
|
|
|
+ if (eventRedstone.getNewCurrent() <= 0) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
|
|
|
world.setTypeUpdate(blockposition, iblockdata.set(BlockButtonAbstract.POWERED, Boolean.valueOf(true)));
|
2015-02-26 23:41:06 +01:00
|
|
|
this.c(world, blockposition, (EnumDirection) iblockdata.get(BlockButtonAbstract.FACING));
|
2014-11-25 22:32:16 +01:00
|
|
|
world.b(blockposition, blockposition);
|
2015-02-26 23:41:06 +01:00
|
|
|
@@ -203,6 +265,16 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!flag && flag1) {
|
|
|
|
+ // CraftBukkit start
|
|
|
|
+ org.bukkit.block.Block block = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
|
|
+
|
|
|
|
+ BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, 15, 0);
|
|
|
|
+ world.getServer().getPluginManager().callEvent(eventRedstone);
|
|
|
|
+
|
|
|
|
+ if (eventRedstone.getNewCurrent() > 0) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
|
|
|
world.setTypeUpdate(blockposition, iblockdata.set(BlockButtonAbstract.POWERED, Boolean.valueOf(false)));
|
2015-02-26 23:41:06 +01:00
|
|
|
this.c(world, blockposition, (EnumDirection) iblockdata.get(BlockButtonAbstract.FACING));
|
2014-11-25 22:32:16 +01:00
|
|
|
world.b(blockposition, blockposition);
|