From 8f4a003db81843d4e075d852352fa6b799e2dc4d Mon Sep 17 00:00:00 2001
From: downthecrop <bryce@mathx.ca>
Date: Tue, 11 Jan 2022 06:25:42 +0000
Subject: [PATCH] Fishing Guild & Edgeville Fixes

---
 CHANGELOG                                           |  3 +++
 .../game/content/activity/guild/FishingGuild.java   |  5 ++---
 .../game/interaction/city/EdgevilleNodePlugin.java  | 13 ++++++-------
 .../object/canoestation/CanoeInterfaceListeners.kt  |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6e2a3dbf9..015ae1056 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -99,3 +99,6 @@
 - Emerald and diamond bracelet enchants no longer produce noted items
 - Prevent furnace temperature from going negative and deduplicate bar handling.
 - Fix player saves for players who used coal on the conveyer belt before bf-fixes.
+- Fix Edgeville canoe -> wilderness pond.
+- Fix Edgeville Dungeon Wilderness gate getting stuck.
+- Fishing guild is able to be entered with a fishing skill boost.
\ No newline at end of file
diff --git a/Server/src/main/java/core/game/content/activity/guild/FishingGuild.java b/Server/src/main/java/core/game/content/activity/guild/FishingGuild.java
index bff6904d3..93802cf69 100644
--- a/Server/src/main/java/core/game/content/activity/guild/FishingGuild.java
+++ b/Server/src/main/java/core/game/content/activity/guild/FishingGuild.java
@@ -30,12 +30,11 @@ public final class FishingGuild extends OptionHandler {
 
 	@Override
 	public boolean handle(Player player, Node node, String option) {
-		final int id = ((Scenery) node).getId();
 		switch (option) {
 		case "open":
-			switch (id) {
+			switch (node.getId()) {
 			case 2025:
-				if (player.getSkills().getStaticLevel(Skills.FISHING) < 68 && player.getLocation().withinDistance(new Location(2611, 3394, 0))) {
+				if (player.getSkills().getDynamicLevels()[Skills.FISHING] < 68 && player.getLocation().withinDistance(new Location(2611, 3394, 0))) {
 					player.getDialogueInterpreter().sendDialogues(308, null, "Hello, I'm afraid only the top fishers are allowed to use", "our premier fishing facilities.");
 					return true;
 				}
diff --git a/Server/src/main/java/core/game/interaction/city/EdgevilleNodePlugin.java b/Server/src/main/java/core/game/interaction/city/EdgevilleNodePlugin.java
index a0578afed..dc2829977 100644
--- a/Server/src/main/java/core/game/interaction/city/EdgevilleNodePlugin.java
+++ b/Server/src/main/java/core/game/interaction/city/EdgevilleNodePlugin.java
@@ -45,8 +45,7 @@ public final class EdgevilleNodePlugin extends OptionHandler {
 
     @Override
     public boolean handle(Player player, Node node, String option) {
-        int id = ((Scenery) node).getId();
-        switch (id) {
+        switch (node.getId()) {
             case 9262:
             case 9261:
             case 30806:
@@ -82,14 +81,14 @@ public final class EdgevilleNodePlugin extends OptionHandler {
             case 29319:
             case 29320: // Edgeville Dungeon wilderness entrance
                 if (option.equalsIgnoreCase("open") && player.getLocation().getY() < 9918) {
-                    Location endLocation = new Location(player.getLocation().getX(),player.getLocation().getY()+1);
-                    player.getInterfaceManager().open(new Component(382));
+                    player.getInterfaceManager().openComponent(382);
                     player.setAttribute("wildy_gate", node);
-                    player.setAttribute("wildy_gate_loc",endLocation);
+                    player.setAttribute("wildy_gate_loc",
+                            Location.create(player.getLocation().getX(),player.getLocation().getY()+1));
                 }
                 else{ // Leaving the wilderness
-                    Location endLocation = new Location(player.getLocation().getX(),player.getLocation().getY()-1);
-                    DoorActionHandler.handleAutowalkDoor(player, (Scenery) node,endLocation);
+                    DoorActionHandler.handleAutowalkDoor(player, (Scenery) node,
+                            Location.create(player.getLocation().getX(),player.getLocation().getY()-1));
                 }
         }
         return true;
diff --git a/Server/src/main/kotlin/rs09/game/interaction/object/canoestation/CanoeInterfaceListeners.kt b/Server/src/main/kotlin/rs09/game/interaction/object/canoestation/CanoeInterfaceListeners.kt
index 579d38d56..72f8a1957 100644
--- a/Server/src/main/kotlin/rs09/game/interaction/object/canoestation/CanoeInterfaceListeners.kt
+++ b/Server/src/main/kotlin/rs09/game/interaction/object/canoestation/CanoeInterfaceListeners.kt
@@ -118,8 +118,8 @@ class CanoeInterfaceListeners : InterfaceListener() {
                             PacketRepository.send(MinimapState::class.java, MinimapStateContext(player, 2))
                             player.interfaceManager.hideTabs(0, 1, 2, 3, 4, 5, 6, 11, 12)
                         }
-                        travelAnimDur -> player.properties.teleportLocation = dest
                         travelAnimDur+1 -> {
+                            player.properties.teleportLocation = dest
                             player.interfaceManager.close(Component(Components.CANOE_TRAVEL_758))
                             player.interfaceManager.closeOverlay()
                             player.interfaceManager.openOverlay(Component(Components.FADE_FROM_BLACK_170))