ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #4631 from Kamielvf/menu-swapper-fairy-ring-fix

Browse Source 
menu entry swapper: fix fairy ring swaps not working for zanaris ring, arceuus ring and PoH tree-ring combo
This commit is contained in:
Tomas Slusny
2018-08-03 19:49:44 +02:00
committed by GitHub
parent 9964d5f327 dd852dbd89
commit eed9c447c6
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/FairyRingMode.java
View File

@@ -33,7 +33,8 @@ public enum FairyRingMode
{ {
ZANARIS("Zanaris"), ZANARIS("Zanaris"),
LAST_DESTINATION("Last-Destination"), LAST_DESTINATION("Last-Destination"),
CONFIGURE("Configure"); CONFIGURE("Configure"),
OFF("Off");
private final String name; private final String name;

9
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
View File

@@ -431,17 +431,22 @@ public class MenuEntrySwapperPlugin extends Plugin
break; 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) if (config.swapFairyRing() == FairyRingMode.LAST_DESTINATION)
{ {
swap("last-destination (", option, target, false); swap("last-destination", option, target, false);
} }
else if (config.swapFairyRing() == FairyRingMode.CONFIGURE) else if (config.swapFairyRing() == FairyRingMode.CONFIGURE)
{ {
swap("configure", option, target, false); 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"))) else if (config.swapBoxTrap() && (option.equals("check") || option.equals("dismantle")))
{ {
swap("reset", option, target, true); swap("reset", option, target, true);