From 7467fda2279e3c5cab426d81a6f19268ff34904d Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Fri, 28 Jun 2019 03:08:40 +0100 Subject: [PATCH] fix for tob/cox options (#784) fix for tob/cox options, otherwise it hides cast for NPC Too --- .../menuentryswapper/MenuEntrySwapperPlugin.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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 c1ce4311b5..b42c56e1d5 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 @@ -910,6 +910,20 @@ public class MenuEntrySwapperPlugin extends Plugin } } } + + Player[] players = client.getCachedPlayers(); + Player player = null; + int identifier = event.getIdentifier(); + + if (identifier >= 0 && identifier < players.length) + { + player = players[identifier]; + } + + if (player == null) + { + return; + } //If the option is already to walk there, or cancel we don't need to swap it with anything if (pOptionToReplace.equals(CANCEL) || pOptionToReplace.equals(WALK_HERE)) @@ -919,6 +933,7 @@ public class MenuEntrySwapperPlugin extends Plugin if (((config.getRemoveFreezePlayerCoX() && client.getVar(Varbits.IN_RAID) == 1) || (config.getRemoveFreezePlayerToB() && client.getVar(Varbits.THEATRE_OF_BLOOD) == 2)) + && (player.isFriend() || player.isClanMember()) && CAST_OPTIONS_KEYWORDS.contains(pOptionToReplace)) { addswap(pOptionToReplace);