Paper/nms-patches/BlockDiodeAbstract.patch

31 lines
1.4 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/BlockDiodeAbstract.java
+++ b/net/minecraft/server/BlockDiodeAbstract.java
@@ -2,6 +2,8 @@
import java.util.Random;
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
+
2016-02-29 22:32:46 +01:00
public abstract class BlockDiodeAbstract extends BlockFacingHorizontal {
2016-02-29 22:32:46 +01:00
protected static final AxisAlignedBB c = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.125D, 1.0D);
@@ -35,8 +37,18 @@
boolean flag = this.e(world, blockposition, iblockdata);
2016-02-29 22:32:46 +01:00
if (this.d && !flag) {
+ // CraftBukkit start
+ if (CraftEventFactory.callRedstoneChange(world, blockposition.getX(), blockposition.getY(), blockposition.getZ(), 15, 0).getNewCurrent() != 0) {
+ return;
+ }
+ // CraftBukkit end
2016-02-29 22:32:46 +01:00
world.setTypeAndData(blockposition, this.y(iblockdata), 2);
} else if (!this.d) {
+ // CraftBukkit start
+ if (CraftEventFactory.callRedstoneChange(world, blockposition.getX(), blockposition.getY(), blockposition.getZ(), 0, 15).getNewCurrent() != 15) {
+ return;
+ }
+ // CraftBukkit end
2016-02-29 22:32:46 +01:00
world.setTypeAndData(blockposition, this.x(iblockdata), 2);
if (!flag) {
2016-02-29 22:32:46 +01:00
world.a(blockposition, this.x(iblockdata).getBlock(), this.D(iblockdata), -1);