OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Call BlockGrowEvent for missing blocks

Browse source 
Call the event for pitcher crops and sniffer egg
This commit is contained in:
Lulu13022002 2023-06-09 13:04:42 +02:00
parent f1735f4440
commit 8ad0899aca
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
paper-server/patches/sources/net/minecraft/world/level/block/PitcherCropBlock.java.patch
View file

@ -17,3 +17,12 @@
if (bl) { if (bl) {
this.grow(world, state, pos, 1); this.grow(world, state, pos, 1);
} }
@@ -141,7 +142,7 @@
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);
}

12
paper-server/patches/sources/net/minecraft/world/level/block/SnifferEggBlock.java.patch
View file

@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/block/SnifferEggBlock.java --- a/net/minecraft/world/level/block/SnifferEggBlock.java
+++ b/net/minecraft/world/level/block/SnifferEggBlock.java +++ b/net/minecraft/world/level/block/SnifferEggBlock.java
@@ -61,12 +61,26 @@ @@ -61,12 +61,31 @@
return this.getHatchLevel(state) == 2; return this.getHatchLevel(state) == 2;
} }
@ -15,8 +15,14 @@
@Override @Override
public void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) { public void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
if (!this.isReadyToHatch(state)) { 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)) {
+ this.rescheduleTick(world, pos);
+ return;
+ }
+ // Paper end
world.playSound(null, pos, SoundEvents.SNIFFER_EGG_CRACK, SoundSource.BLOCKS, 0.7F, 0.9F + random.nextFloat() * 0.2F); world.playSound(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); - world.setBlock(pos, state.setValue(HATCH, Integer.valueOf(this.getHatchLevel(state) + 1)), 2);
} else { } else {
+ // Paper start - Call BlockFadeEvent + // Paper start - Call BlockFadeEvent
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world, pos, state.getFluidState().createLegacyBlock()).isCancelled()) { + if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world, pos, state.getFluidState().createLegacyBlock()).isCancelled()) {
@ -27,7 +33,7 @@
world.playSound(null, pos, SoundEvents.SNIFFER_EGG_HATCH, SoundSource.BLOCKS, 0.7F, 0.9F + random.nextFloat() * 0.2F); world.playSound(null, pos, SoundEvents.SNIFFER_EGG_HATCH, SoundSource.BLOCKS, 0.7F, 0.9F + random.nextFloat() * 0.2F);
world.destroyBlock(pos, false); world.destroyBlock(pos, false);
Sniffer sniffer = EntityType.SNIFFER.create(world, EntitySpawnReason.BREEDING); Sniffer sniffer = EntityType.SNIFFER.create(world, EntitySpawnReason.BREEDING);
@@ -74,7 +88,7 @@ @@ -74,7 +93,7 @@
Vec3 vec3 = pos.getCenter(); Vec3 vec3 = pos.getCenter();
sniffer.setBaby(true); sniffer.setBaby(true);
sniffer.moveTo(vec3.x(), vec3.y(), vec3.z(), Mth.wrapDegrees(world.random.nextFloat() * 360.0F), 0.0F); sniffer.moveTo(vec3.x(), vec3.y(), vec3.z(), Mth.wrapDegrees(world.random.nextFloat() * 360.0F), 0.0F);