aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0756-Correctly-handle-interactions-with-items-on-cooldown.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0756-Correctly-handle-interactions-with-items-on-cooldown.patch')
-rw-r--r--patches/server/0756-Correctly-handle-interactions-with-items-on-cooldown.patch60
1 files changed, 60 insertions, 0 deletions
diff --git a/patches/server/0756-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0756-Correctly-handle-interactions-with-items-on-cooldown.patch
new file mode 100644
index 0000000000..5b61753747
--- /dev/null
+++ b/patches/server/0756-Correctly-handle-interactions-with-items-on-cooldown.patch
@@ -0,0 +1,60 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Thu, 16 Jun 2022 21:57:02 -0700
+Subject: [PATCH] Correctly handle interactions with items on cooldown
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+index 03d89f326d320c5d778c3d1e2db7d6b88753faec..717d015dd4637dd9d568b751be1dc1046b0a0560 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+@@ -514,6 +514,7 @@ public class ServerPlayerGameMode {
+ BlockPos blockposition = hitResult.getBlockPos();
+ BlockState iblockdata = world.getBlockState(blockposition);
+ boolean cancelledBlock = false;
++ boolean cancelledItem = false; // Paper - correctly handle items on cooldown
+
+ if (!iblockdata.getBlock().isEnabled(world.enabledFeatures())) {
+ return InteractionResult.FAIL;
+@@ -523,10 +524,10 @@ public class ServerPlayerGameMode {
+ }
+
+ if (player.getCooldowns().isOnCooldown(stack.getItem())) {
+- cancelledBlock = true;
++ cancelledItem = true; // Paper - correctly handle items on cooldown
+ }
+
+- PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, blockposition, hitResult.getDirection(), stack, cancelledBlock, hand, hitResult.getLocation());
++ PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, blockposition, hitResult.getDirection(), stack, cancelledBlock, cancelledItem, hand, hitResult.getLocation()); // Paper - correctly handle items on cooldown
+ this.firedInteract = true;
+ this.interactResult = event.useItemInHand() == Event.Result.DENY;
+ this.interactPosition = blockposition.immutable();
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index 15afaf9b2fcff25288eb5739c9cc72fb301b875a..8233b2287c9cf3cfb4fd3f44d61c055e4076b355 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -546,6 +546,12 @@ public class CraftEventFactory {
+ }
+
+ public static PlayerInteractEvent callPlayerInteractEvent(net.minecraft.world.entity.player.Player who, Action action, BlockPos position, Direction direction, ItemStack itemstack, boolean cancelledBlock, InteractionHand hand, Vec3 targetPos) {
++ // Paper start - cancelledItem param
++ return CraftEventFactory.callPlayerInteractEvent(who, action, position, direction, itemstack, cancelledBlock, false, hand, targetPos);
++ }
++
++ public static PlayerInteractEvent callPlayerInteractEvent(net.minecraft.world.entity.player.Player who, Action action, BlockPos position, Direction direction, ItemStack itemstack, boolean cancelledBlock, boolean cancelledItem, InteractionHand hand, Vec3 targetPos) {
++ // Paper end - cancelledItem param
+ Player player = (who == null) ? null : (Player) who.getBukkitEntity();
+ CraftItemStack itemInHand = CraftItemStack.asCraftMirror(itemstack);
+
+@@ -580,6 +586,11 @@ public class CraftEventFactory {
+ if (cancelledBlock) {
+ event.setUseInteractedBlock(Event.Result.DENY);
+ }
++ // Paper start
++ if (cancelledItem) {
++ event.setUseItemInHand(Result.DENY);
++ }
++ // Paper end
+ craftServer.getPluginManager().callEvent(event);
+
+ return event;