Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-7518: Fix NullPointerException when calling Block#applyBoneMeal()

Browse Source
This commit is contained in:
Parker Hawke 2023-11-12 19:09:58 -05:00
parent 5a2d905aff
commit 864f616da6
No known key found for this signature in database
GPG Key ID: FD2A5649C53ADFE0
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nms-patches/net/minecraft/world/item/ItemBoneMeal.patch
View File

@ -1,6 +1,6 @@
--- a/net/minecraft/world/item/ItemBoneMeal.java --- a/net/minecraft/world/item/ItemBoneMeal.java
+++ b/net/minecraft/world/item/ItemBoneMeal.java +++ b/net/minecraft/world/item/ItemBoneMeal.java
@@ -34,6 +34,12 @@ @@ -34,13 +34,19 @@
@Override @Override
public EnumInteractionResult useOn(ItemActionContext itemactioncontext) { public EnumInteractionResult useOn(ItemActionContext itemactioncontext) {
@ -13,3 +13,20 @@
World world = itemactioncontext.getLevel(); World world = itemactioncontext.getLevel();
BlockPosition blockposition = itemactioncontext.getClickedPos(); BlockPosition blockposition = itemactioncontext.getClickedPos();
BlockPosition blockposition1 = blockposition.relative(itemactioncontext.getClickedFace()); BlockPosition blockposition1 = blockposition.relative(itemactioncontext.getClickedFace());
if (growCrop(itemactioncontext.getItemInHand(), world, blockposition)) {
if (!world.isClientSide) {
- itemactioncontext.getPlayer().gameEvent(GameEvent.ITEM_INTERACT_FINISH);
+ if (itemactioncontext.getPlayer() != null) itemactioncontext.getPlayer().gameEvent(GameEvent.ITEM_INTERACT_FINISH); // CraftBukkit - SPIGOT-7518
world.levelEvent(1505, blockposition, 0);
}
@@ -51,7 +57,7 @@
if (flag && growWaterPlant(itemactioncontext.getItemInHand(), world, blockposition1, itemactioncontext.getClickedFace())) {
if (!world.isClientSide) {
- itemactioncontext.getPlayer().gameEvent(GameEvent.ITEM_INTERACT_FINISH);
+ if (itemactioncontext.getPlayer() != null) itemactioncontext.getPlayer().gameEvent(GameEvent.ITEM_INTERACT_FINISH); // CraftBukkit - SPIGOT-7518
world.levelEvent(1505, blockposition1, 0);
}