From 101d471c7cd31a3806ff2db2a04f82f117f85ae1 Mon Sep 17 00:00:00 2001 From: Christopher O'Hara Date: Sun, 30 Sep 2018 18:11:37 -0500 Subject: [PATCH] Show hop-to option in clan chat menu when target player is a friend and their private chat is off --- .../worldhopper/WorldHopperPlugin.java | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java index 1d73a47bd3..a6bc3b8c28 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java @@ -660,19 +660,8 @@ public class WorldHopperPlugin extends Plugin { String cleanName = Text.removeTags(name); - Friend[] friends = client.getFriends(); - - if (friends != null) - { - for (Friend friend : friends) - { - if (friend != null && friend.getName().equals(cleanName)) - { - return friend; - } - } - } - + // Search clan members first, because if a friend is in the clan chat but their private + // chat is 'off', then the hop-to option will not get shown in the menu (issue #5679). ClanMember[] clanMembers = client.getClanMembers(); if (clanMembers != null) @@ -686,6 +675,19 @@ public class WorldHopperPlugin extends Plugin } } + Friend[] friends = client.getFriends(); + + if (friends != null) + { + for (Friend friend : friends) + { + if (friend != null && friend.getName().equals(cleanName)) + { + return friend; + } + } + } + return null; } }