From 541d1cc08db065a6c498bda4816dd34352241ba5 Mon Sep 17 00:00:00 2001
From: RedSparr0w <admin@redsparr0w.com>
Date: Fri, 25 Oct 2019 19:01:22 +1300
Subject: [PATCH] catch

---
 .idea/workspace.xml                               | 6 +++---
 src/main/java/ParaScript/strategies/Fighting.java | 2 +-
 src/main/java/ParaScript/strategies/Fish.java     | 6 ++++++
 src/main/java/ParaScript/strategies/Mine.java     | 2 +-
 src/main/java/ParaScript/strategies/Thieving.java | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f8f17ef..c2489d1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,12 +3,12 @@
   <component name="ChangeListManager">
     <list default="true" id="14d0b690-21f2-4a9c-b8cf-803e9cc87ab5" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/data/Variables.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/data/Variables.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/Fighting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/Fighting.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/Fish.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/Fish.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/Killer.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/MakeArrowShafts.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/MakeArrowShafts.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/Mine.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/Mine.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/PickupItems.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/PickupItems.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/ui/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/ui/UI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/Thieving.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/ParaScript/strategies/Thieving.java" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/main/java/ParaScript/strategies/Fighting.java b/src/main/java/ParaScript/strategies/Fighting.java
index cac058a..561986b 100644
--- a/src/main/java/ParaScript/strategies/Fighting.java
+++ b/src/main/java/ParaScript/strategies/Fighting.java
@@ -46,7 +46,7 @@ public class Fighting implements Strategy {
                     return victim;
                 }
             }
-        } catch (Exception err){}
+        } catch (Exception ಠ_ಠ){}
         return null;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/ParaScript/strategies/Fish.java b/src/main/java/ParaScript/strategies/Fish.java
index 0399fee..36e1f09 100644
--- a/src/main/java/ParaScript/strategies/Fish.java
+++ b/src/main/java/ParaScript/strategies/Fish.java
@@ -29,6 +29,12 @@ public class Fish implements Strategy {
     @Override
     public void execute() {
         try {
+            if (Variables.shouldDropItems()) {
+                if (Inventory.getCount(441) >= 1) Inventory.getItem(441).interact(Items.Option.DROP);
+            }
+            for (int item_id: items)
+                if (Inventory.getItem(item_id + 1) != null)
+                    Menu.sendAction(431,  item_id, Inventory.getItem(item_id + 1).getSlot(), 5064, 3);
             fishingSpot.interact(Variables.fishing_type_selected);
             Time.sleep(1000);
             // Wait for the Player to finish fishing (max 60 seconds)
diff --git a/src/main/java/ParaScript/strategies/Mine.java b/src/main/java/ParaScript/strategies/Mine.java
index f366e4b..1d58ce8 100644
--- a/src/main/java/ParaScript/strategies/Mine.java
+++ b/src/main/java/ParaScript/strategies/Mine.java
@@ -39,7 +39,7 @@ public class Mine implements Strategy {
             ore.interact(SceneObjects.Option.MINE);
             Time.sleep(1000);
             Time.sleep(() -> Players.getMyPlayer().getAnimation() == -1, 3000);
-        } catch (Exception err){
+        } catch (Exception ಠ_ಠ){
             System.out.println("Mining error: ¯\\_(ツ)_/¯");
         }
     }
diff --git a/src/main/java/ParaScript/strategies/Thieving.java b/src/main/java/ParaScript/strategies/Thieving.java
index bf2757f..f1642f5 100644
--- a/src/main/java/ParaScript/strategies/Thieving.java
+++ b/src/main/java/ParaScript/strategies/Thieving.java
@@ -44,7 +44,7 @@ public class Thieving implements Strategy {
                     return victim;
                 }
             }
-        } catch (Exception err){}
+        } catch (Exception ಠ_ಠ){}
         return null;
     }
 }
\ No newline at end of file