menu entry swapper: fix zanaris swap not working for PoH tree-ring combo

This commit is contained in:
Kamiel
2018-08-02 01:05:21 +02:00
parent 00e9d1cd1f
commit dd852dbd89
2 changed files with 8 additions and 2 deletions

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;

View File

@@ -430,7 +430,8 @@ public class MenuEntrySwapperPlugin extends Plugin
break; break;
} }
} }
else if (config.swapFairyRing() != FairyRingMode.ZANARIS && (option.equals("zanaris") || option.equals("configure") || 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)
{ {
@@ -441,6 +442,10 @@ public class MenuEntrySwapperPlugin extends Plugin
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);