1 files changed, 75 insertions, 0 deletions
diff --git a/patches/server/0957-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0957-Add-hand-to-fish-event-for-all-player-interactions.patch
new file mode 100644
index 0000000000..39764d836e
--- /dev/null
+++ b/patches/server/0957-Add-hand-to-fish-event-for-all-player-interactions.patch
@@ -0,0 +1,75 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: booky10 <[email protected]>
+Date: Mon, 3 Jul 2023 01:55:32 +0200
+Subject: [PATCH] Add hand to fish event for all player interactions
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
+index a87fcd5b837e1c824cbd5587c3350986e2fd7acb..91497f5e6c07fcf1b05eca6846c51e1a15ed3bc0 100644
+--- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
+@@ -475,7 +475,15 @@ public class FishingHook extends Projectile {
+     @Override
+     public void readAdditionalSaveData(CompoundTag nbt) {}
+ 
++    // Paper start - Add hand parameter to PlayerFishEvent
++    @Deprecated
++    @io.papermc.paper.annotation.DoNotUse
+     public int retrieve(ItemStack usedItem) {
++        return this.retrieve(net.minecraft.world.InteractionHand.MAIN_HAND, usedItem);
++    }
++
++    public int retrieve(net.minecraft.world.InteractionHand hand, ItemStack usedItem) {
++        // Paper end - Add hand parameter to PlayerFishEvent
+         net.minecraft.world.entity.player.Player entityhuman = this.getPlayerOwner();
+ 
+         if (!this.level().isClientSide && entityhuman != null && !this.shouldStopFishing(entityhuman)) {
+@@ -483,7 +491,7 @@ public class FishingHook extends Projectile {
+ 
+             if (this.hookedIn != null) {
+                 // CraftBukkit start
+-                PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), this.hookedIn.getBukkitEntity(), (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.CAUGHT_ENTITY);
++                PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), this.hookedIn.getBukkitEntity(), (FishHook) this.getBukkitEntity(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand), PlayerFishEvent.State.CAUGHT_ENTITY); // Paper - Add hand parameter to PlayerFishEvent
+                 this.level().getCraftServer().getPluginManager().callEvent(playerFishEvent);
+ 
+                 if (playerFishEvent.isCancelled()) {
+@@ -512,7 +520,7 @@ public class FishingHook extends Projectile {
+                     }
+                     // Paper end
+                     // CraftBukkit start
+-                    PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), entityitem != null ? entityitem.getBukkitEntity() : null, (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.CAUGHT_FISH); // Paper - entityitem may be null
++                    PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), entityitem != null ? entityitem.getBukkitEntity() : null, (FishHook) this.getBukkitEntity(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand), PlayerFishEvent.State.CAUGHT_FISH); // Paper - entityitem may be null // Paper - Add hand parameter to PlayerFishEvent
+                     playerFishEvent.setExpToDrop(this.random.nextInt(6) + 1);
+                     this.level().getCraftServer().getPluginManager().callEvent(playerFishEvent);
+ 
+@@ -546,7 +554,7 @@ public class FishingHook extends Projectile {
+ 
+             if (this.onGround()) {
+                 // CraftBukkit start
+-                PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), null, (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.IN_GROUND);
++                PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), null, (FishHook) this.getBukkitEntity(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand), PlayerFishEvent.State.IN_GROUND); // Paper - Add hand parameter to PlayerFishEvent
+                 this.level().getCraftServer().getPluginManager().callEvent(playerFishEvent);
+ 
+                 if (playerFishEvent.isCancelled()) {
+@@ -557,7 +565,7 @@ public class FishingHook extends Projectile {
+             }
+             // CraftBukkit start
+             if (i == 0) {
+-                PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), null, (FishHook) this.getBukkitEntity(), PlayerFishEvent.State.REEL_IN);
++                PlayerFishEvent playerFishEvent = new PlayerFishEvent((Player) entityhuman.getBukkitEntity(), null, (FishHook) this.getBukkitEntity(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand), PlayerFishEvent.State.REEL_IN); // Paper - Add hand parameter to PlayerFishEvent
+                 this.level().getCraftServer().getPluginManager().callEvent(playerFishEvent);
+                 if (playerFishEvent.isCancelled()) {
+                     return 0;
+diff --git a/src/main/java/net/minecraft/world/item/FishingRodItem.java b/src/main/java/net/minecraft/world/item/FishingRodItem.java
+index b9aca584c9765e995d1f8b9b2e45e5257fb6ab9d..95144f0ea5e99285c0a82b9d2e60766b785a236d 100644
+--- a/src/main/java/net/minecraft/world/item/FishingRodItem.java
++++ b/src/main/java/net/minecraft/world/item/FishingRodItem.java
+@@ -29,7 +29,7 @@ public class FishingRodItem extends Item implements Vanishable {
+ 
+         if (user.fishing != null) {
+             if (!world.isClientSide) {
+-                i = user.fishing.retrieve(itemstack);
++                i = user.fishing.retrieve(hand, itemstack); // Paper - Add hand parameter to PlayerFishEvent
+                 itemstack.hurtAndBreak(i, user, (entityhuman1) -> {
+                     entityhuman1.broadcastBreakEvent(hand);
+                 });