add remapped patches as a testsoftspoon

1 files changed, 21 insertions, 0 deletions

diff --git a/patch-remap/mache-spigotflower-stripped/net/minecraft/world/level/block/BushBlock.java.patch b/patch-remap/mache-spigotflower-stripped/net/minecraft/world/level/block/BushBlock.java.patch
new file mode 100644
index 0000000000..eb1a377017
--- /dev/null
+++ b/patch-remap/mache-spigotflower-stripped/net/minecraft/world/level/block/BushBlock.java.patch
@@ -0,0 +1,21 @@
+--- a/net/minecraft/world/level/block/BushBlock.java
++++ b/net/minecraft/world/level/block/BushBlock.java
+@@ -26,9 +25,15 @@
+     }
+ 
+     @Override
+-    @Override
+-    public BlockState updateShape(BlockState blockstate, Direction direction, BlockState blockstate1, LevelAccessor levelaccessor, BlockPos blockpos, BlockPos blockpos1) {
+-        return !blockstate.canSurvive(levelaccessor, blockpos) ? Blocks.AIR.defaultBlockState() : super.updateShape(blockstate, direction, blockstate1, levelaccessor, blockpos, blockpos1);
++    public IBlockData updateShape(IBlockData state, Direction facing, IBlockData facingState, LevelAccessor level, BlockPos currentPos, BlockPos facingPos) {
++        // CraftBukkit start
++        if (!state.canSurvive(level, currentPos)) {
++            if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPhysicsEvent(level, currentPos).isCancelled()) {
++                return Blocks.AIR.defaultBlockState();
++            }
++        }
++        return super.updateShape(state, facing, facingState, level, currentPos, facingPos);
++        // CraftBukkit end
+     }
+ 
+     @Override