Use Share for FishingRodItemMixin

Author: aromaa

src/mixins/java/org/spongepowered/common/mixin/core/world/item/FishingRodItemMixin.java

@@ -24,6 +24,8 @@
  */
 package org.spongepowered.common.mixin.core.world.item;
 
+import com.llamalad7.mixinextras.sugar.Share;
+import com.llamalad7.mixinextras.sugar.ref.LocalRef;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
@@ -35,8 +37,8 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.level.Level;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.entity.projectile.FishingBobber;
+import org.spongepowered.api.event.CauseStackManager;
 import org.spongepowered.api.event.SpongeEventFactory;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -49,11 +51,9 @@
 @Mixin(FishingRodItem.class)
 public abstract class FishingRodItemMixin {
 
-    @Nullable private FishingHook impl$fishHook;
-
     @Inject(method = "use", at = @At(value = "INVOKE", shift = At.Shift.AFTER,
             target = "Lnet/minecraft/world/entity/projectile/FishingHook;retrieve(Lnet/minecraft/world/item/ItemStack;)I"), cancellable = true)
-    private void cancelHookRetraction(Level world, Player player, InteractionHand hand, CallbackInfoReturnable<InteractionResultHolder<ItemStack>> cir) {
+    private void impl$cancelHookRetraction(Level world, Player player, InteractionHand hand, CallbackInfoReturnable<InteractionResultHolder<ItemStack>> cir) {
         if (player.fishing != null) {
             // Event was cancelled
             cir.setReturnValue(new InteractionResultHolder<>(InteractionResult.SUCCESS, player.getItemInHand(hand)));
@@ -63,7 +63,8 @@ private void cancelHookRetraction(Level world, Player player, InteractionHand ha
     @Inject(method = "use", at = @At(value = "INVOKE",
             target = "Lnet/minecraft/world/level/Level;playSound(Lnet/minecraft/world/entity/player/Player;DDDLnet/minecraft/sounds/SoundEvent;Lnet/minecraft/sounds/SoundSource;FF)V", ordinal = 1),
             cancellable = true)
-    private void onThrowEvent(Level level, Player player, InteractionHand hand, CallbackInfoReturnable<InteractionResultHolder<ItemStack>> cir) {
+    private void impl$onThrowEvent(Level level, Player player, InteractionHand hand, CallbackInfoReturnable<InteractionResultHolder<ItemStack>> cir,
+            @Share("entity") LocalRef<FishingHook> entityRef) {
         if (level.isClientSide) {
             // Only fire event on server-side to avoid crash on client
             return;
@@ -75,23 +76,23 @@ private void onThrowEvent(Level level, Player player, InteractionHand hand, Call
             int $$7 = EnchantmentHelper.getFishingLuckBonus(serverLevel, itemstack, player);
             FishingHook fishHook = new FishingHook(player, level, $$7, $$6);
 
-            PhaseTracker.getInstance().pushCause(player);
-            if (SpongeCommon.post(SpongeEventFactory.createFishingEventStart(PhaseTracker.getInstance().currentCause(), (FishingBobber) fishHook))) {
-                fishHook.remove(Entity.RemovalReason.DISCARDED); // Bye
-                cir.setReturnValue(new InteractionResultHolder<>(InteractionResult.SUCCESS, player.getItemInHand(hand)));
-            } else {
-                this.impl$fishHook = fishHook;
+            try (final CauseStackManager.StackFrame frame = PhaseTracker.getInstance().pushCauseFrame()) {
+                frame.pushCause(player);
+                if (SpongeCommon.post(SpongeEventFactory.createFishingEventStart(PhaseTracker.getInstance().currentCause(), (FishingBobber) fishHook))) {
+                    fishHook.remove(Entity.RemovalReason.DISCARDED); // Bye
+                    cir.setReturnValue(new InteractionResultHolder<>(InteractionResult.SUCCESS, player.getItemInHand(hand)));
+                } else {
+                    entityRef.set(fishHook);
+                }
             }
-            PhaseTracker.getInstance().popCause();
         }
     }
 
     @Redirect(method = "use", at = @At(value = "NEW", target = "net/minecraft/world/entity/projectile/FishingHook"))
-    private FishingHook onNewEntityFishHook(Player p_i50220_1_, Level p_i50220_2_, int p_i50220_3_, int p_i50220_4_) {
+    private FishingHook impl$onNewEntityFishHook(Player p_i50220_1_, Level p_i50220_2_, int p_i50220_3_, int p_i50220_4_,
+            @Share("entity") LocalRef<FishingHook> entityRef) {
         // Use the fish hook we created for the event
-        FishingHook fishHook = this.impl$fishHook;
-        this.impl$fishHook = null;
-        return fishHook;
+        return entityRef.get();
     }
 
 }