2022-07-30 18:58:37 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
|
|
Date: Thu, 21 Jul 2022 12:07:54 -0400
|
|
|
|
Subject: [PATCH] Add missing BlockFadeEvents
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
|
2022-12-09 11:46:47 +01:00
|
|
|
index 834c5e3fbff3819f3f72e95a1072d9b9e57f25b3..294d22b6b27e96b59c77527efcfefa9410b756e4 100644
|
2022-07-30 18:58:37 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
|
2022-12-09 11:46:47 +01:00
|
|
|
@@ -85,6 +85,11 @@ public class FrogspawnBlock extends Block {
|
2022-07-30 18:58:37 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
private void hatchFrogspawn(ServerLevel world, BlockPos pos, RandomSource random) {
|
|
|
|
+ // Paper start - Call BlockFadeEvent
|
|
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world, pos, Blocks.AIR.defaultBlockState()).isCancelled()) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
this.destroyBlock(world, pos);
|
|
|
|
world.playSound((Player)null, pos, SoundEvents.FROGSPAWN_HATCH, SoundSource.BLOCKS, 1.0F, 1.0F);
|
|
|
|
this.spawnTadpoles(world, pos, random);
|
2023-08-26 22:12:46 +02:00
|
|
|
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 1e115adfcfee518667559100d04050f5e71c8a23..8aaa3cb2248a02b5ee25251cc837a145edd34341 100644
|
|
|
|
--- a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java
|
|
|
|
@@ -54,12 +54,26 @@ public class SnifferEggBlock extends Block {
|
|
|
|
return this.getHatchLevel(state) == 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ private void rescheduleTick(ServerLevel world, BlockPos pos) {
|
|
|
|
+ int baseDelay = hatchBoost(world, pos) ? BOOSTED_HATCH_TIME_TICKS : REGULAR_HATCH_TIME_TICKS;
|
|
|
|
+ world.scheduleTick(pos, this, (baseDelay / 3) + world.random.nextInt(RANDOM_HATCH_OFFSET_TICKS));
|
|
|
|
+ // reschedule to avoid being stuck here and behave like the other calls (see #onPlace)
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
@Override
|
|
|
|
public void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
|
|
|
|
if (!this.isReadyToHatch(state)) {
|
|
|
|
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()) {
|
|
|
|
+ rescheduleTick(world, pos);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
world.playSound((Player)null, pos, SoundEvents.SNIFFER_EGG_HATCH, SoundSource.BLOCKS, 0.7F, 0.9F + random.nextFloat() * 0.2F);
|
|
|
|
world.destroyBlock(pos, false);
|
|
|
|
Sniffer sniffer = EntityType.SNIFFER.create(world);
|