twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 20:52:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Cancel PlayerLaunchProjectileEvent properly for enderpearls (#12223)

Browse Source
This commit is contained in:
Lulu13022002
2025-03-08 23:02:10 +01:00
committed by GitHub
parent df96f8a0fa
commit 2565497897
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
paper-server/patches/sources/net/minecraft/world/item/EnderpearlItem.java.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/item/EnderpearlItem.java --- a/net/minecraft/world/item/EnderpearlItem.java
+++ b/net/minecraft/world/item/EnderpearlItem.java +++ b/net/minecraft/world/item/EnderpearlItem.java
@@ -21,22 +_,38 @@ @@ -21,22 +_,42 @@
@Override @Override
public InteractionResult use(Level level, Player player, InteractionHand hand) { public InteractionResult use(Level level, Player player, InteractionHand hand) {
ItemStack itemInHand = player.getItemInHand(hand); ItemStack itemInHand = player.getItemInHand(hand);
@@ -39,7 +39,11 @@
+ ); + );
+ player.awardStat(Stats.ITEM_USED.get(this)); + player.awardStat(Stats.ITEM_USED.get(this));
+ } else { + } else {
+ // Paper end - PlayerLaunchProjectileEvent + if (player instanceof net.minecraft.server.level.ServerPlayer serverPlayer) {
+ serverPlayer.deregisterEnderPearl(thrownEnderpearl.projectile());
+ serverPlayer.connection.send(new net.minecraft.network.protocol.game.ClientboundCooldownPacket(player.getCooldowns().getCooldownGroup(itemInHand), 0)); // prevent visual desync of cooldown on the slot
+ }
+ // Paper end - PlayerLaunchProjectileEvent
+ player.containerMenu.sendAllDataToRemote(); + player.containerMenu.sendAllDataToRemote();
+ return InteractionResult.FAIL; + return InteractionResult.FAIL;
+ } + }