diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/FairyRingMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/FairyRingMode.java index 615fd040ed..731561a9a6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/FairyRingMode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/FairyRingMode.java @@ -33,7 +33,8 @@ public enum FairyRingMode { ZANARIS("Zanaris"), LAST_DESTINATION("Last-Destination"), - CONFIGURE("Configure"); + CONFIGURE("Configure"), + OFF("Off"); private final String name; 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 ce1c6083cf..ca6158610d 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 @@ -431,17 +431,22 @@ public class MenuEntrySwapperPlugin extends Plugin break; } } - else if (config.swapFairyRing() != FairyRingMode.ZANARIS && (option.equals("zanaris") || option.equals("tree"))) + else if (config.swapFairyRing() != FairyRingMode.OFF && config.swapFairyRing() != FairyRingMode.ZANARIS + && (option.equals("zanaris") || option.equals("configure") || option.equals("tree"))) { if (config.swapFairyRing() == FairyRingMode.LAST_DESTINATION) { - swap("last-destination (", option, target, false); + swap("last-destination", option, target, false); } else if (config.swapFairyRing() == FairyRingMode.CONFIGURE) { swap("configure", option, target, false); } } + else if (config.swapFairyRing() == FairyRingMode.ZANARIS && option.equals("tree")) + { + swap("zanaris", option, target, false); + } else if (config.swapBoxTrap() && (option.equals("check") || option.equals("dismantle"))) { swap("reset", option, target, true);