From 4d975ac3b76e5f22720c63858ac6345f0da06fe8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 29 Mar 2020 16:24:11 +1100 Subject: [PATCH] SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current --- nms-patches/BlockNote.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nms-patches/BlockNote.patch b/nms-patches/BlockNote.patch index aae703400d..ce30d691d4 100644 --- a/nms-patches/BlockNote.patch +++ b/nms-patches/BlockNote.patch @@ -1,15 +1,16 @@ --- a/net/minecraft/server/BlockNote.java +++ b/net/minecraft/server/BlockNote.java -@@ -27,7 +27,7 @@ +@@ -27,7 +27,8 @@ if (flag1 != (Boolean) iblockdata.get(BlockNote.POWERED)) { if (flag1) { - this.play(world, blockposition); + this.play(world, blockposition, iblockdata); // CraftBukkit ++ iblockdata = world.getType(blockposition); // CraftBukkit - SPIGOT-5617: update in case changed in event } world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockNote.POWERED, flag1), 3); -@@ -35,9 +35,14 @@ +@@ -35,9 +36,14 @@ } @@ -26,7 +27,7 @@ } } -@@ -49,7 +54,7 @@ +@@ -49,7 +55,7 @@ } else { iblockdata = (IBlockData) iblockdata.a((IBlockState) BlockNote.NOTE); world.setTypeAndData(blockposition, iblockdata, 3); @@ -35,7 +36,7 @@ entityhuman.a(StatisticList.TUNE_NOTEBLOCK); return EnumInteractionResult.SUCCESS; } -@@ -58,7 +63,7 @@ +@@ -58,7 +64,7 @@ @Override public void attack(IBlockData iblockdata, World world, BlockPosition blockposition, EntityHuman entityhuman) { if (!world.isClientSide) {