diff options
Diffstat (limited to 'nms-patches/BlockRedstoneOre.patch')
| -rw-r--r-- | nms-patches/BlockRedstoneOre.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nms-patches/BlockRedstoneOre.patch b/nms-patches/BlockRedstoneOre.patch index e9312c2c..01d88722 100644 --- a/nms-patches/BlockRedstoneOre.patch +++ b/nms-patches/BlockRedstoneOre.patch @@ -53,25 +53,25 @@ - private static void interact(IBlockData iblockdata, World world, BlockPosition blockposition) { + private static void interact(IBlockData iblockdata, World world, BlockPosition blockposition, Entity entity) { // CraftBukkit - add Entity playEffect(world, blockposition); - if (!((Boolean) iblockdata.get(BlockRedstoneOre.a)).booleanValue()) { + if (!(Boolean) iblockdata.get(BlockRedstoneOre.a)) { + // CraftBukkit start -+ if (CraftEventFactory.callEntityChangeBlockEvent(entity, blockposition, iblockdata.set(BlockRedstoneOre.a, Boolean.valueOf(true))).isCancelled()) { ++ if (CraftEventFactory.callEntityChangeBlockEvent(entity, blockposition, iblockdata.set(BlockRedstoneOre.a, true)).isCancelled()) { + return; + } + // CraftBukkit end - world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockRedstoneOre.a, Boolean.valueOf(true)), 3); + world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockRedstoneOre.a, true), 3); } @@ -40,6 +66,11 @@ public void a(IBlockData iblockdata, World world, BlockPosition blockposition, Random random) { - if (((Boolean) iblockdata.get(BlockRedstoneOre.a)).booleanValue()) { + if ((Boolean) iblockdata.get(BlockRedstoneOre.a)) { + // CraftBukkit start -+ if (CraftEventFactory.callBlockFadeEvent(world, blockposition, iblockdata.set(BlockRedstoneOre.a, Boolean.valueOf(false))).isCancelled()) { ++ if (CraftEventFactory.callBlockFadeEvent(world, blockposition, iblockdata.set(BlockRedstoneOre.a, false)).isCancelled()) { + return; + } + // CraftBukkit end - world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockRedstoneOre.a, Boolean.valueOf(false)), 3); + world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockRedstoneOre.a, false), 3); } @@ -59,12 +90,25 @@ |