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

menuentryswapper: remove early return (#797)

Browse Source
This commit is contained in:
se7enAte9
2019-06-28 15:07:07 -04:00
committed by Kyleeld
parent e7af9222fb
commit 8b3a70d115
1 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -906,34 +906,28 @@ 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 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)) if (!pOptionToReplace.equals(CANCEL) && !pOptionToReplace.equals(WALK_HERE))
{ {
return; Player[] players = client.getCachedPlayers();
} int identifier = event.getIdentifier();
if (((config.getRemoveFreezePlayerCoX() && client.getVar(Varbits.IN_RAID) == 1) if (identifier >= 0 && identifier < players.length)
|| (config.getRemoveFreezePlayerToB() && client.getVar(Varbits.THEATRE_OF_BLOOD) == 2))
&& (player.isFriend() || player.isClanMember())
&& CAST_OPTIONS_KEYWORDS.contains(pOptionToReplace))
{ {
addswap(pOptionToReplace); Player player = players[identifier];
if (player != null)
{
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);
}
}
} }
}
if (option.equals("talk-to")) if (option.equals("talk-to"))
{ {