From 5cfa68387f8b4befb06c212cdc77c23e37855ff1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 31 Jul 2018 10:17:43 +1000 Subject: SPIGOT-4194: Call BlockFadeEvent for coral --- nms-patches/BlockCoral.patch | 14 ++++++++++++++ nms-patches/BlockCoralFan.patch | 14 ++++++++++++++ nms-patches/BlockCoralFanWall.patch | 14 ++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 nms-patches/BlockCoral.patch create mode 100644 nms-patches/BlockCoralFan.patch create mode 100644 nms-patches/BlockCoralFanWall.patch diff --git a/nms-patches/BlockCoral.patch b/nms-patches/BlockCoral.patch new file mode 100644 index 00000000..6b5b5afc --- /dev/null +++ b/nms-patches/BlockCoral.patch @@ -0,0 +1,14 @@ +--- a/net/minecraft/server/BlockCoral.java ++++ b/net/minecraft/server/BlockCoral.java +@@ -14,6 +14,11 @@ + + public void a(IBlockData iblockdata, World world, BlockPosition blockposition, Random random) { + if (!this.a((IBlockAccess) world, blockposition)) { ++ // CraftBukkit start ++ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world, blockposition, this.a.getBlockData()).isCancelled()) { ++ return; ++ } ++ // CraftBukkit end + world.setTypeAndData(blockposition, this.a.getBlockData(), 2); + } + diff --git a/nms-patches/BlockCoralFan.patch b/nms-patches/BlockCoralFan.patch new file mode 100644 index 00000000..6214c646 --- /dev/null +++ b/nms-patches/BlockCoralFan.patch @@ -0,0 +1,14 @@ +--- a/net/minecraft/server/BlockCoralFan.java ++++ b/net/minecraft/server/BlockCoralFan.java +@@ -17,6 +17,11 @@ + + public void a(IBlockData iblockdata, World world, BlockPosition blockposition, Random random) { + if (!b_(iblockdata, world, blockposition)) { ++ // CraftBukkit start ++ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world, blockposition, this.b.getBlockData().set(BlockCoralFan.a, Boolean.valueOf(false))).isCancelled()) { ++ return; ++ } ++ // CraftBukkit end + world.setTypeAndData(blockposition, (IBlockData) this.b.getBlockData().set(BlockCoralFan.a, Boolean.valueOf(false)), 2); + } + diff --git a/nms-patches/BlockCoralFanWall.patch b/nms-patches/BlockCoralFanWall.patch new file mode 100644 index 00000000..6c2adc68 --- /dev/null +++ b/nms-patches/BlockCoralFanWall.patch @@ -0,0 +1,14 @@ +--- a/net/minecraft/server/BlockCoralFanWall.java ++++ b/net/minecraft/server/BlockCoralFanWall.java +@@ -17,6 +17,11 @@ + + public void a(IBlockData iblockdata, World world, BlockPosition blockposition, Random random) { + if (!b_(iblockdata, world, blockposition)) { ++ // CraftBukkit start ++ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world, blockposition, this.c.getBlockData().set(BlockCoralFanWall.a, Boolean.valueOf(false)).set(BlockCoralFanWall.b, iblockdata.get(BlockCoralFanWall.b))).isCancelled()) { ++ return; ++ } ++ // CraftBukkit end + world.setTypeAndData(blockposition, (IBlockData) ((IBlockData) this.c.getBlockData().set(BlockCoralFanWall.a, Boolean.valueOf(false))).set(BlockCoralFanWall.b, iblockdata.get(BlockCoralFanWall.b)), 2); + } + -- cgit v1.2.3