From d96496d42e2515626f2ea9d4f4f0c02dd73f7528 Mon Sep 17 00:00:00 2001
From: Teriuihi <teriuihi@alttd.com>
Date: Sat, 30 Sep 2023 00:40:46 +0200
Subject: [PATCH] Fix lava fishing

---
 .../java/com/alttd/fishingevent/listeners/CatchFish.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/alttd/fishingevent/listeners/CatchFish.java b/src/main/java/com/alttd/fishingevent/listeners/CatchFish.java
index d56d6ab..9b35a66 100644
--- a/src/main/java/com/alttd/fishingevent/listeners/CatchFish.java
+++ b/src/main/java/com/alttd/fishingevent/listeners/CatchFish.java
@@ -110,7 +110,8 @@ public class CatchFish implements Listener {
                 return;
             }
             handleFishCaught(event);
-        } else if (event.getState().equals(PlayerFishEvent.State.IN_GROUND)) {
+        } else if (event.getState().equals(PlayerFishEvent.State.IN_GROUND) || event.getState().equals(PlayerFishEvent.State.REEL_IN)) {
+            stopLavaFishStart(uuid);
             handleLavaFishCaught(event);
         } else {
             stopLavaFishStart(uuid);
@@ -174,6 +175,12 @@ public class CatchFish implements Listener {
     }
 
     private void handleFishCaught(PlayerFishEvent event) {
+        UUID uuid = event.getPlayer().getUniqueId();
+        LavaFishing lavaFishing = activeLavaFishers.get(uuid);
+        if (lavaFishing != null) {
+            lavaFishing.cancel();
+            activeLavaFishers.remove(uuid);
+        }
         Entity caught = event.getCaught();
         if (!(caught instanceof Item item)) {
             logger.warning("% did not catch an item", event.getPlayer().getName());