mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-09 20:30:28 +01:00
40 lines
1.7 KiB
Diff
40 lines
1.7 KiB
Diff
--- a/net/minecraft/server/BlockCommand.java
|
|
+++ b/net/minecraft/server/BlockCommand.java
|
|
@@ -2,6 +2,8 @@
|
|
|
|
import java.util.Random;
|
|
|
|
+import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit
|
|
+
|
|
public class BlockCommand extends BlockTileEntity {
|
|
|
|
public static final BlockStateDirection a = BlockDirectional.FACING;
|
|
@@ -29,7 +31,17 @@
|
|
boolean flag1 = tileentitycommand.d();
|
|
boolean flag2 = tileentitycommand.e();
|
|
|
|
- if (flag && !flag1) {
|
|
+ // CraftBukkit start
|
|
+ // PAIL: This section - renames, ordering
|
|
+ org.bukkit.block.Block bukkitBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
+ int old = flag1 ? 15 : 0;
|
|
+ int current = flag ? 15 : 0;
|
|
+
|
|
+ BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(bukkitBlock, old, current);
|
|
+ world.getServer().getPluginManager().callEvent(eventRedstone);
|
|
+ // CraftBukkit end
|
|
+
|
|
+ if (eventRedstone.getNewCurrent() > 0 && !(eventRedstone.getOldCurrent() > 0)) { // CraftBukkit
|
|
tileentitycommand.a(true);
|
|
if (tileentitycommand.i() != TileEntityCommand.Type.SEQUENCE && !flag2) {
|
|
boolean flag3 = !tileentitycommand.j() || this.e(world, blockposition, iblockdata);
|
|
@@ -40,7 +52,7 @@
|
|
this.c(world, blockposition);
|
|
}
|
|
}
|
|
- } else if (!flag && flag1) {
|
|
+ } else if (!(eventRedstone.getNewCurrent() > 0) && eventRedstone.getOldCurrent() > 0) { // CraftBukkit
|
|
tileentitycommand.a(false);
|
|
}
|
|
|