2022-10-07 17:22:45 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
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
|
2023-11-04 20:20:01 +01:00
|
|
|
index 25cbbc714e86c11dcf05329430a83bba2cd05364..4b1af7bba3ce10a1247bb61535456510e18da2d9 100644
|
2022-10-07 17:22:45 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
|
2023-12-03 04:41:35 +01:00
|
|
|
@@ -516,6 +516,7 @@ public class ServerPlayerGameMode {
|
2022-10-07 17:22:45 +02:00
|
|
|
BlockState iblockdata = world.getBlockState(blockposition);
|
|
|
|
InteractionResult enuminteractionresult = InteractionResult.PASS;
|
|
|
|
boolean cancelledBlock = false;
|
|
|
|
+ boolean cancelledItem = false; // Paper - correctly handle items on cooldown
|
|
|
|
|
2022-12-07 23:05:32 +01:00
|
|
|
if (!iblockdata.getBlock().isEnabled(world.enabledFeatures())) {
|
|
|
|
return InteractionResult.FAIL;
|
2023-12-03 04:41:35 +01:00
|
|
|
@@ -525,10 +526,10 @@ public class ServerPlayerGameMode {
|
2022-10-07 17:22:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (player.getCooldowns().isOnCooldown(stack.getItem())) {
|
|
|
|
- cancelledBlock = true;
|
|
|
|
+ cancelledItem = true; // Paper - correctly handle items on cooldown
|
|
|
|
}
|
|
|
|
|
2023-06-18 13:03:18 +02:00
|
|
|
- PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, blockposition, hitResult.getDirection(), stack, cancelledBlock, hand, hitResult.getLocation());
|
2022-10-07 17:22:45 +02:00
|
|
|
+ PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, blockposition, hitResult.getDirection(), stack, cancelledBlock, cancelledItem, hand, hitResult.getLocation()); // Paper
|
|
|
|
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
|
2023-11-11 21:25:45 +01:00
|
|
|
index 914fb155cbd79d0a1c4fbd5389ae3a15e76cad61..5f35eed82193e1868102cdfa931f1cb2c7662185 100644
|
2022-10-07 17:22:45 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
2023-11-11 21:25:45 +01:00
|
|
|
@@ -546,7 +546,13 @@ public class CraftEventFactory {
|
2023-06-18 13:03:18 +02:00
|
|
|
return CraftEventFactory.callPlayerInteractEvent(who, action, position, direction, itemstack, false, hand, null);
|
2022-10-07 17:22:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+
|
2023-06-18 13:03:18 +02:00
|
|
|
+ // Paper start - cancelledItem param
|
|
|
|
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) {
|
2023-06-23 18:03:43 +02:00
|
|
|
+ return CraftEventFactory.callPlayerInteractEvent(who, action, position, direction, itemstack, cancelledBlock, false, hand, targetPos);
|
2023-06-18 13:03:18 +02:00
|
|
|
+ }
|
|
|
|
+ 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
|
2022-10-07 17:22:45 +02:00
|
|
|
Player player = (who == null) ? null : (Player) who.getBukkitEntity();
|
|
|
|
CraftItemStack itemInHand = CraftItemStack.asCraftMirror(itemstack);
|
2023-06-18 13:03:18 +02:00
|
|
|
|
2023-11-11 21:25:45 +01:00
|
|
|
@@ -581,6 +587,11 @@ public class CraftEventFactory {
|
2022-10-07 17:22:45 +02:00
|
|
|
if (cancelledBlock) {
|
|
|
|
event.setUseInteractedBlock(Event.Result.DENY);
|
|
|
|
}
|
|
|
|
+ // Paper start
|
|
|
|
+ if (cancelledItem) {
|
|
|
|
+ event.setUseItemInHand(Result.DENY);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
craftServer.getPluginManager().callEvent(event);
|
|
|
|
|
|
|
|
return event;
|