aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0873-Call-BlockGrowEvent-for-missing-blocks.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0873-Call-BlockGrowEvent-for-missing-blocks.patch')
-rw-r--r--patches/server/0873-Call-BlockGrowEvent-for-missing-blocks.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/patches/server/0873-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0873-Call-BlockGrowEvent-for-missing-blocks.patch
new file mode 100644
index 0000000000..9054b42b6b
--- /dev/null
+++ b/patches/server/0873-Call-BlockGrowEvent-for-missing-blocks.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lulu13022002 <[email protected]>
+Date: Fri, 9 Jun 2023 13:04:42 +0200
+Subject: [PATCH] Call BlockGrowEvent for missing blocks
+
+Call the event for pitcher crops and sniffer egg
+
+diff --git a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java
+index 591f32f7c0a7a9c843933d17dad8a34b672f49ac..d20c009baf69d083bf8a14000028991b6518cd50 100644
+--- a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java
+@@ -130,7 +130,7 @@ public class PitcherCropBlock extends DoublePlantBlock implements BonemealableBl
+ int i = Math.min(state.getValue(AGE) + amount, 4);
+ if (this.canGrow(world, pos, state, i)) {
+ BlockState blockState = state.setValue(AGE, Integer.valueOf(i));
+- world.setBlock(pos, blockState, 2);
++ if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, pos, blockState, 2)) return; // Paper
+ if (isDouble(i)) {
+ world.setBlock(pos.above(), blockState.setValue(HALF, DoubleBlockHalf.UPPER), 3);
+ }
+diff --git a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
+index 6d073e82daf41e35b63703ab9bce8c576862eb3e..7be4e32a4409b539839a480ef83750ed4b5359a6 100644
+--- a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
+@@ -72,8 +72,13 @@ public class SnifferEggBlock extends Block {
+ @Override
+ public void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
+ if (!this.isReadyToHatch(state)) {
++ // Paper start
++ if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, pos, state.setValue(HATCH, Integer.valueOf(this.getHatchLevel(state) + 1)), 2)) {
++ rescheduleTick(world, pos);
++ return;
++ }
++ // Paper end
+ world.playSound((Player)null, pos, SoundEvents.SNIFFER_EGG_CRACK, SoundSource.BLOCKS, 0.7F, 0.9F + random.nextFloat() * 0.2F);
+- world.setBlock(pos, state.setValue(HATCH, Integer.valueOf(this.getHatchLevel(state) + 1)), 2);
+ } else {
+ // Paper start - Call BlockFadeEvent
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world, pos, state.getFluidState().createLegacyBlock()).isCancelled()) {