Skip to content

feat: tilling now calls EntityChangeBlockEvent #13730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
harrybridgen wants to merge 1 commit into
base: main
Choose a base branch
from
+36 −0
Open

feat: tilling now calls EntityChangeBlockEvent #13730

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions paper-server/patches/sources/net/minecraft/world/item/HoeItem.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
--- a/net/minecraft/world/item/HoeItem.java
+++ b/net/minecraft/world/item/HoeItem.java
@@ -21,6 +_,17 @@
import net.minecraft.world.level.gameevent.GameEvent;

public class HoeItem extends Item {
+ // Paper start - EntityChangeBlockEvent
+ private static final Map<Block, BlockState> TILLABLE_STATES = Maps.newHashMap(
+ ImmutableMap.of(
+ Blocks.GRASS_BLOCK, Blocks.FARMLAND.defaultBlockState(),
+ Blocks.DIRT_PATH, Blocks.FARMLAND.defaultBlockState(),
+ Blocks.DIRT, Blocks.FARMLAND.defaultBlockState(),
+ Blocks.COARSE_DIRT, Blocks.DIRT.defaultBlockState(),
+ Blocks.ROOTED_DIRT, Blocks.DIRT.defaultBlockState()
+ )
+ );
+ // Paper end - EntityChangeBlockEvent
protected static final Map<Block, Pair<Predicate<UseOnContext>, Consumer<UseOnContext>>> TILLABLES = Maps.newHashMap(
ImmutableMap.of(
Blocks.GRASS_BLOCK,
@@ -52,8 +_,14 @@
Consumer<UseOnContext> consumer = pair.getSecond();
if (predicate.test(context)) {
Player player = context.getPlayer();
- level.playSound(player, clickedPos, SoundEvents.HOE_TILL, SoundSource.BLOCKS, 1.0F, 1.0F);
if (!level.isClientSide()) {
+ // Paper start - EntityChangeBlockEvent
+ BlockState newState = TILLABLE_STATES.get(level.getBlockState(clickedPos).getBlock());
+ if (newState != null && player != null && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(player, clickedPos, newState)) {
+ return InteractionResult.PASS;
+ }
+ // Paper end - EntityChangeBlockEvent
+ level.playSound(player, clickedPos, SoundEvents.HOE_TILL, SoundSource.BLOCKS, 1.0F, 1.0F); // Paper - moved inside isClientSide check
consumer.accept(context);
if (player != null) {
context.getItemInHand().hurtAndBreak(1, player, context.getHand().asEquipmentSlot());