Skip to content

Handle item use when block interaction is denied #13782

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
officialasishkumar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Handle item use when block interaction is denied #13782

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
21 changes: 17 additions & 4 deletions paper-server/patches/sources/net/minecraft/server/level/ServerPlayerGameMode.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
}

return result;
@@ -340,17 +_,55 @@
@@ -340,17 +_,59 @@
}
}

Expand Down Expand Up @@ -366,7 +366,8 @@
+ this.interactHand = hand;
+ this.interactItemStack = itemStack.copy();
+
+ if (event.useInteractedBlock() == org.bukkit.event.Event.Result.DENY) {
+ final boolean deniedBlockInteraction = event.useInteractedBlock() == org.bukkit.event.Event.Result.DENY; // Paper - Allow item use when denying block interaction
+ if (deniedBlockInteraction) { // Paper - Allow item use when denying block interaction
+ // Block acks will take care of most of it, just handle some special cases here
+ if (state.getBlock() instanceof net.minecraft.world.level.block.CakeBlock) {
+ player.getBukkitEntity().sendHealthUpdate(); // SPIGOT-1341 - reset health for cake
Expand All @@ -381,13 +382,25 @@
+ }
+ // Paper end - Fix inventory desync
+ this.player.resyncUsingItem(this.player); // Paper - Properly cancel usable items
+ return (event.useItemInHand() != org.bukkit.event.Event.Result.ALLOW) ? InteractionResult.SUCCESS : InteractionResult.PASS;
+ } else if (this.gameModeForPlayer == GameType.SPECTATOR) {
+ if (event.useItemInHand() != org.bukkit.event.Event.Result.ALLOW) return InteractionResult.SUCCESS; // Paper - Allow item use when denying block interaction
+ }
+
+ if (this.gameModeForPlayer == GameType.SPECTATOR) {
+ if (deniedBlockInteraction) return InteractionResult.PASS; // Paper - Allow item use when denying block interaction
+ MenuProvider menuProvider = state.getMenuProvider(level, pos);
+ if (menuProvider != null && player.openMenu(menuProvider).isPresent()) { // Paper - Fix InventoryOpenEvent cancellation
return InteractionResult.CONSUME;
} else {
return InteractionResult.PASS;
@@ -359,7 +_,7 @@
boolean haveSomethingInOurHands = !player.getMainHandItem().isEmpty() || !player.getOffhandItem().isEmpty();
boolean suppressUsingBlock = player.isSecondaryUseActive() && haveSomethingInOurHands;
ItemStack usedItemStack = itemStack.copy();
- if (!suppressUsingBlock) {
+ if (!deniedBlockInteraction && !suppressUsingBlock) { // Paper - Allow item use when denying block interaction
InteractionResult itemUse = state.useItemOn(player.getItemInHand(hand), level, player, hand, hitResult);
if (itemUse.consumesAction()) {
CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger(player, pos, usedItemStack);
@@ -375,7 +_,7 @@
}
}
Expand Down