Merge pull request #4631 from Kamielvf/menu-swapper-fairy-ring-fix
menu entry swapper: fix fairy ring swaps not working for zanaris ring, arceuus ring and PoH tree-ring combo
This commit is contained in:
@@ -33,7 +33,8 @@ public enum FairyRingMode
|
||||
{
|
||||
ZANARIS("Zanaris"),
|
||||
LAST_DESTINATION("Last-Destination"),
|
||||
CONFIGURE("Configure");
|
||||
CONFIGURE("Configure"),
|
||||
OFF("Off");
|
||||
|
||||
private final String name;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user