From e494f2894ebd51f82aa5c69fb28f895b6f5469fe Mon Sep 17 00:00:00 2001
From: Epic <EpicEbic@outlook.com>
Date: Mon, 17 Feb 2025 23:19:30 +0000
Subject: [PATCH] Correctly call BlockFadeEvents (#12141)

---
 .../net/minecraft/world/level/block/FarmBlock.java.patch | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/paper-server/patches/sources/net/minecraft/world/level/block/FarmBlock.java.patch b/paper-server/patches/sources/net/minecraft/world/level/block/FarmBlock.java.patch
index fb670445d..7b5e8dcbc 100644
--- a/paper-server/patches/sources/net/minecraft/world/level/block/FarmBlock.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/level/block/FarmBlock.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/block/FarmBlock.java
 +++ b/net/minecraft/world/level/block/FarmBlock.java
-@@ -95,31 +_,56 @@
+@@ -95,31 +_,59 @@
      @Override
      protected void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
          int moistureValue = state.getValue(MOISTURE);
@@ -53,8 +53,11 @@
  
      public static void turnToDirt(@Nullable Entity entity, BlockState state, Level level, BlockPos pos) {
 +        // CraftBukkit start
-+        if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(level, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) {
-+            return;
++        if (entity == null) {
++            if (org.bukkit.craftbukkit.event.CraftEventFactory
++                .callBlockFadeEvent(level, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) {
++                return;
++            }
 +        }
 +        // CraftBukkit end
          BlockState blockState = pushEntitiesUp(state, Blocks.DIRT.defaultBlockState(), level, pos);