From d5766e82d4f0b24e145930d4aa523bb1f214d390 Mon Sep 17 00:00:00 2001
From: Kyleeld <48519776+Kyleeld@users.noreply.github.com>
Date: Tue, 2 Jul 2019 09:37:25 +0100
Subject: [PATCH] fixes

fixes 853, part of 805.

added in the correct swaps && mising target.equals evaluation points.
---
 .../menuentryswapper/MenuEntrySwapperConfig.java |  6 ++++--
 .../menuentryswapper/MenuEntrySwapperPlugin.java | 16 +++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
index e90c97acdc..121b1f395c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
@@ -1671,7 +1671,8 @@ default CharterOption charterOption()
 		keyName = "removeFreezePlayerToB",
 		name = "Remove freeze in ToB",
 		description = "Removes the freeze option for ice barrage, ice blitz, entangle etc. in ToB",
-		position = 0
+		position = 0,
+		group = "PVM"
 	)
 
 	default boolean getRemoveFreezePlayerToB()
@@ -1683,7 +1684,8 @@ default CharterOption charterOption()
 		keyName = "removeFreezePlayerCoX",
 		name = "Remove freeze in CoX",
 		description = "Removes the freeze option for ice barrage, ice blitz, entangle etc. in CoX",
-		position = 1
+		position = 1,
+		group = "PVM"
 	)
 
 	default boolean getRemoveFreezePlayerCoX()
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
index f7f04ddef9..4e8490a4c4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
@@ -1044,10 +1044,21 @@ public class MenuEntrySwapperPlugin extends Plugin
 			swap(client, "stun", option, target, true);
 		}
 
-		else if (config.swapTravel() && (option.equals("pass") || option.equals("open")))
+		else if (config.swapTravel() && option.equals("pass") && target.equals("energy barrier"))
 		{
-			swap(client, "pay-toll", option, target, false);
+			swap(client, "pay-toll(2-ecto)", option, target, true);
 		}
+
+		else if (config.swapTravel() && option.equals("open") && target.equals("gate"))
+		{
+			swap(client, "pay-toll(10gp)", option, target, true);
+		}
+		
+		else if (config.swapHardWoodGrove() && option.equals("open") && target.equals("hardwood grove doors"))
+		{
+			swap(client, "quick-pay(100)", option, target, true);
+		}
+		
 		else if (config.swapTravel() && option.equals("inspect") && target.equals("trapdoor"))
 		{
 			swap(client, "travel", option, target, true);
@@ -1160,7 +1171,6 @@ public class MenuEntrySwapperPlugin extends Plugin
 		else if (config.swapQuick() && option.equals("pass"))
 		{
 			swap(client, "quick-pass", option, target, true);
-			swap(client, "quick pass", option, target, true);
 		}
 
 		else if (config.swapQuick() && option.equals("open"))