mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 22:13:42 +01:00
97 lines
4.4 KiB
Diff
97 lines
4.4 KiB
Diff
--- a/net/minecraft/server/BlockButtonAbstract.java
|
|
+++ b/net/minecraft/server/BlockButtonAbstract.java
|
|
@@ -4,6 +4,11 @@
|
|
import java.util.Random;
|
|
import javax.annotation.Nullable;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.event.block.BlockRedstoneEvent;
|
|
+import org.bukkit.event.entity.EntityInteractEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public abstract class BlockButtonAbstract extends BlockAttachable {
|
|
|
|
public static final BlockStateBoolean POWERED = BlockProperties.w;
|
|
@@ -70,6 +75,19 @@
|
|
if ((Boolean) iblockdata.get(BlockButtonAbstract.POWERED)) {
|
|
return EnumInteractionResult.CONSUME;
|
|
} 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 EnumInteractionResult.SUCCESS;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.d(iblockdata, world, blockposition);
|
|
this.a(entityhuman, world, blockposition, true);
|
|
return EnumInteractionResult.a(world.isClientSide);
|
|
@@ -120,6 +138,16 @@
|
|
if (this.v) {
|
|
this.e(iblockdata, (World) worldserver, blockposition);
|
|
} else {
|
|
+ // CraftBukkit start
|
|
+ org.bukkit.block.Block block = worldserver.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
+
|
|
+ BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, 15, 0);
|
|
+ worldserver.getServer().getPluginManager().callEvent(eventRedstone);
|
|
+
|
|
+ if (eventRedstone.getNewCurrent() > 0) {
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
worldserver.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockButtonAbstract.POWERED, false), 3);
|
|
this.f(iblockdata, (World) worldserver, blockposition);
|
|
this.a((EntityHuman) null, worldserver, blockposition, false);
|
|
@@ -140,7 +168,44 @@
|
|
boolean flag = !list.isEmpty();
|
|
boolean flag1 = (Boolean) iblockdata.get(BlockButtonAbstract.POWERED);
|
|
|
|
+ // 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
|
|
+
|
|
if (flag != flag1) {
|
|
+ // CraftBukkit start
|
|
+ boolean powered = flag1;
|
|
+ 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 ((flag && eventRedstone.getNewCurrent() <= 0) || (!flag && eventRedstone.getNewCurrent() > 0)) {
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockButtonAbstract.POWERED, flag), 3);
|
|
this.f(iblockdata, world, blockposition);
|
|
this.a((EntityHuman) null, world, blockposition, flag);
|