From 0f52e3ff18dcece4ff0ca39148bc2d0a9fb96e55 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 18 Dec 2021 11:19:07 -0500 Subject: [PATCH] menu swapper: fix built in swaps overriding custom swaps If a swap is configured for the item, never enter into the built in swapping logic. Even if the swap was not applied for this entry, assume either it has already been applied or will be later. Co-authored-by: sam --- .../plugins/menuentryswapper/MenuEntrySwapperPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 1b6a6acd29..7fa8f7fba2 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 @@ -711,7 +711,7 @@ public class MenuEntrySwapperPlugin extends Plugin if (itemOp) { Integer swapIndex = getSwapConfig(false, eventId); - if (swapIndex != null && index < menuEntries.length - 1) + if (swapIndex != null) { MenuAction swapAction = swapIndex >= 0 ? MenuAction.of(MenuAction.ITEM_FIRST_OPTION.getId() + swapIndex) @@ -720,8 +720,8 @@ public class MenuEntrySwapperPlugin extends Plugin if (menuAction == swapAction) { swap(optionIndexes, menuEntries, index, menuEntries.length - 1); - return; } + return; } }