From bde2d94770e46b03e4017ebce72cbb288309dd22 Mon Sep 17 00:00:00 2001
From: Tim Granata <40129993+Timmy-Jim@users.noreply.github.com>
Date: Tue, 12 Jun 2018 09:47:08 -0400
Subject: [PATCH] Add Isafdar dense forest agility boxes north of Tyras Camp
 (#3731)

---
 .../client/plugins/agility/Obstacles.java       |  2 +-
 .../client/plugins/fishing/FishingSpot.java     | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java
index 1caa6a7ce4..d0015d1de8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java
@@ -180,7 +180,7 @@ public class Obstacles
 		PILLAR_31561,
 		// Elf Camp Isafdar Tirranwn
 		LOG_BALANCE_3931, LOG_BALANCE_3930, LOG_BALANCE_3929, LOG_BALANCE_3932, DENSE_FOREST_3938, DENSE_FOREST_3939,
-		DENSE_FOREST, LEAVES, LEAVES_3924, LEAVES_3925, STICKS, TRIPWIRE,
+		DENSE_FOREST_3998, DENSE_FOREST_3999, DENSE_FOREST, LEAVES, LEAVES_3924, LEAVES_3925, STICKS, TRIPWIRE,
 		// Gu'Tanoth bridge
 		GAP, GAP_2831
 	);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java
index 79a90452fc..34a5a2a3b0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java
@@ -41,7 +41,6 @@ import static net.runelite.api.NpcID.FISHING_SPOT_1528;
 import static net.runelite.api.NpcID.FISHING_SPOT_1530;
 import static net.runelite.api.NpcID.FISHING_SPOT_1542;
 import static net.runelite.api.NpcID.FISHING_SPOT_1544;
-import static net.runelite.api.NpcID.FISHING_SPOT_3419;
 import static net.runelite.api.NpcID.FISHING_SPOT_3913;
 import static net.runelite.api.NpcID.FISHING_SPOT_3914;
 import static net.runelite.api.NpcID.FISHING_SPOT_3915;
@@ -82,8 +81,6 @@ import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1513;
 import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1515;
 import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1526;
 import static net.runelite.api.NpcID.ROD_FISHING_SPOT_1527;
-import static net.runelite.api.NpcID.ROD_FISHING_SPOT_3417;
-import static net.runelite.api.NpcID.ROD_FISHING_SPOT_3418;
 import static net.runelite.api.NpcID.ROD_FISHING_SPOT_6825;
 import static net.runelite.api.NpcID.ROD_FISHING_SPOT_7463;
 import static net.runelite.api.NpcID.ROD_FISHING_SPOT_7464;
@@ -105,11 +102,11 @@ public enum FishingSpot
 		FISHING_SPOT_7460, FISHING_SPOT_7465, FISHING_SPOT_7470,
 		FISHING_SPOT_7946
 	),
-	SHARK("Shark, Bass, Cod, Mackerel", ItemID.RAW_SHARK,
-		FISHING_SPOT_1511, FISHING_SPOT_1520, FISHING_SPOT_3419,
-		FISHING_SPOT_3915, FISHING_SPOT_4476, FISHING_SPOT_4477,
-		FISHING_SPOT_5233, FISHING_SPOT_5234, FISHING_SPOT_5821,
-		FISHING_SPOT_7200, FISHING_SPOT_7461, FISHING_SPOT_7466
+	SHARK("Shark, Bass", ItemID.RAW_SHARK,
+		FISHING_SPOT_1511, FISHING_SPOT_1520, FISHING_SPOT_3915,
+		FISHING_SPOT_4476, FISHING_SPOT_4477, FISHING_SPOT_5233,
+		FISHING_SPOT_5234, FISHING_SPOT_5821, FISHING_SPOT_7200,
+		FISHING_SPOT_7461, FISHING_SPOT_7466
 	),
 	MONKFISH("Monkfish", ItemID.RAW_MONKFISH,
 		FISHING_SPOT_4316
@@ -117,8 +114,8 @@ public enum FishingSpot
 	SALMON("Salmon, Trout", ItemID.RAW_SALMON,
 		ROD_FISHING_SPOT, ROD_FISHING_SPOT_1508, ROD_FISHING_SPOT_1509,
 		ROD_FISHING_SPOT_1513, ROD_FISHING_SPOT_1515, ROD_FISHING_SPOT_1526,
-		ROD_FISHING_SPOT_1527, ROD_FISHING_SPOT_3417, ROD_FISHING_SPOT_3418,
-		ROD_FISHING_SPOT_7463, ROD_FISHING_SPOT_7464, ROD_FISHING_SPOT_7468
+		ROD_FISHING_SPOT_1527, ROD_FISHING_SPOT_7463, ROD_FISHING_SPOT_7464,
+		ROD_FISHING_SPOT_7468
 	),
 	BARB_FISH("Sturgeon, Salmon, Trout", ItemID.LEAPING_STURGEON,
 		FISHING_SPOT_1542, FISHING_SPOT_7323