SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Somehow a bunch of items were missed

Browse Source
This commit is contained in:
Jake Potrebic
2024-12-14 22:35:35 -08:00
parent 35afd218f5
commit 172a80cb66
25 changed files with 475 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
paper-server/patches/sources/net/minecraft/world/item/BoneMealItem.java.patch Normal file
View File

@@ -0,0 +1,30 @@
--- a/net/minecraft/world/item/BoneMealItem.java
+++ b/net/minecraft/world/item/BoneMealItem.java
@@ -33,12 +_,17 @@
@Override
public InteractionResult useOn(UseOnContext context) {
+ // CraftBukkit start - extract bonemeal application logic to separate, static method
+ return BoneMealItem.applyBonemeal(context);
+ }
+ public static InteractionResult applyBonemeal(UseOnContext context) {
+ // CraftBukkit end
Level level = context.getLevel();
BlockPos clickedPos = context.getClickedPos();
BlockPos blockPos = clickedPos.relative(context.getClickedFace());
if (growCrop(context.getItemInHand(), level, clickedPos)) {
if (!level.isClientSide) {
- context.getPlayer().gameEvent(GameEvent.ITEM_INTERACT_FINISH);
+ if (context.getPlayer() != null) context.getPlayer().gameEvent(GameEvent.ITEM_INTERACT_FINISH); // CraftBukkit - SPIGOT-7518
level.levelEvent(1505, clickedPos, 15);
}
@@ -48,7 +_,7 @@
boolean isFaceSturdy = blockState.isFaceSturdy(level, clickedPos, context.getClickedFace());
if (isFaceSturdy && growWaterPlant(context.getItemInHand(), level, blockPos, context.getClickedFace())) {
if (!level.isClientSide) {
- context.getPlayer().gameEvent(GameEvent.ITEM_INTERACT_FINISH);
+ if (context.getPlayer() != null) context.getPlayer().gameEvent(GameEvent.ITEM_INTERACT_FINISH); // CraftBukkit - SPIGOT-7518
level.levelEvent(1505, blockPos, 15);
}