PaperMC/nms-patches/BlockRedstoneWire.patch

37 lines
1.5 KiB
Diff
Raw Normal View History

2015-02-26 23:41:06 +01:00
--- /home/matt/mc-dev-private//net/minecraft/server/BlockRedstoneWire.java 2015-02-26 22:40:22.239608143 +0000
+++ src/main/java/net/minecraft/server/BlockRedstoneWire.java 2015-02-26 22:40:22.239608143 +0000
@@ -8,6 +8,8 @@
import java.util.Random;
import java.util.Set;
+import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit
+
public class BlockRedstoneWire extends Block {
2015-02-26 23:41:06 +01:00
public static final BlockStateEnum<BlockRedstoneWire.EnumRedstoneWireConnection> NORTH = BlockStateEnum.of("north", BlockRedstoneWire.EnumRedstoneWireConnection.class);
@@ -124,6 +126,15 @@
j = k;
}
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start
+ if (i != j) {
+ BlockRedstoneEvent event = new BlockRedstoneEvent(world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), i, j);
+ world.getServer().getPluginManager().callEvent(event);
+
+ j = event.getNewCurrent();
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
if (i != j) {
iblockdata = iblockdata.set(BlockRedstoneWire.POWER, Integer.valueOf(j));
2015-02-26 23:41:06 +01:00
if (world.getType(blockposition) == iblockdata1) {
@@ -232,7 +243,7 @@
}
}
- private int getPower(World world, BlockPosition blockposition, int i) {
+ public int getPower(World world, BlockPosition blockposition, int i) { // CraftBukkit - public
if (world.getType(blockposition).getBlock() != this) {
return i;
} else {