-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
7d13b70
commit 0e622c7
Showing
8 changed files
with
139 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
patches/server/0965-Call-BlockGrowEvent-for-missing-blocks.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 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()) { |
19 changes: 0 additions & 19 deletions
19
patches/server/0965-Call-BlockGrowEvent-for-the-pitcher-crop.patch
This file was deleted.
Oops, something went wrong.
28 changes: 28 additions & 0 deletions
28
patches/server/1028-Configure-sniffer-egg-hatch-time.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Lulu13022002 <[email protected]> | ||
| Date: Tue, 27 Jun 2023 13:26:06 +0200 | ||
| Subject: [PATCH] Configure sniffer egg hatch time | ||
|
|
||
|
|
||
| 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 fab44502b3e22eb8d1311068f88290ce31adb437..16c5be04658a66ff94f2aad8782e34f450e9a729 100644 | ||
| --- a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java | ||
| +++ b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java | ||
| @@ -56,7 +56,7 @@ public class SnifferEggBlock extends Block { | ||
|
|
||
| // Paper start | ||
| private void rescheduleTick(ServerLevel world, BlockPos pos) { | ||
| - int baseDelay = hatchBoost(world, pos) ? BOOSTED_HATCH_TIME_TICKS : REGULAR_HATCH_TIME_TICKS; | ||
| + int baseDelay = hatchBoost(world, pos) ? world.paperConfig().entities.sniffer.boostedHatchTime.or(BOOSTED_HATCH_TIME_TICKS) : world.paperConfig().entities.sniffer.hatchTime.or(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) | ||
| } | ||
| @@ -99,7 +99,7 @@ public class SnifferEggBlock extends Block { | ||
| world.levelEvent(3009, pos, 0); | ||
| } | ||
|
|
||
| - int i = bl ? 12000 : 24000; | ||
| + int i = bl ? world.paperConfig().entities.sniffer.boostedHatchTime.or(BOOSTED_HATCH_TIME_TICKS) : world.paperConfig().entities.sniffer.hatchTime.or(REGULAR_HATCH_TIME_TICKS); // Paper | ||
| int j = i / 3; | ||
| world.gameEvent(GameEvent.BLOCK_PLACE, pos, GameEvent.Context.of(state)); | ||
| world.scheduleTick(pos, this, j + world.random.nextInt(300)); |