Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
40 Zeilen
2.8 KiB
Diff
40 Zeilen
2.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
|
||
|
|
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 849c0ae6ca30691134f51e5d4d5da372e0e728bd..d2e8aafb8db17f2426dd83353c0cfdeaf0d372aa 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java
|
||
|
|
@@ -126,7 +126,7 @@ public class PitcherCropBlock extends DoublePlantBlock implements BonemealableBl
|
||
|
|
private void grow(ServerLevel world, BlockState state, BlockPos pos, int amount) {
|
||
|
|
int i = Math.min(state.getValue(AGE) + amount, 4);
|
||
|
|
if (this.canGrow(world, pos, state, i)) {
|
||
|
|
- world.setBlock(pos, state.setValue(AGE, Integer.valueOf(i)), 2);
|
||
|
|
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, pos, state.setValue(AGE, Integer.valueOf(i)), 2)) return; // Paper
|
||
|
|
if (i >= 3) {
|
||
|
|
BlockPos blockPos = pos.above();
|
||
|
|
world.setBlock(blockPos, copyWaterloggedFrom(world, pos, this.defaultBlockState().setValue(AGE, Integer.valueOf(i)).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 ecb8224beb0ee65855c7529b69ea56b7b6674664..fab44502b3e22eb8d1311068f88290ce31adb437 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
|
||
|
|
@@ -65,8 +65,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()) {
|