Merge pull request #8591 from deathbeam/dont-count-local-player

Do not count local player in nearby clan member counter
This commit is contained in:
Tomas Slusny
2019-04-23 09:58:09 +02:00
committed by GitHub

View File

@@ -168,11 +168,12 @@ public class ClanChatPlugin extends Plugin
if (member.getWorld() == client.getWorld()) if (member.getWorld() == client.getWorld())
{ {
final Player local = client.getLocalPlayer();
final String memberName = Text.toJagexName(member.getUsername()); final String memberName = Text.toJagexName(member.getUsername());
for (final Player player : client.getPlayers()) for (final Player player : client.getPlayers())
{ {
if (player != null && memberName.equals(Text.toJagexName(player.getName()))) if (player != null && player != local && memberName.equals(Text.toJagexName(player.getName())))
{ {
clanMembers.add(player); clanMembers.add(player);
addClanCounter(); addClanCounter();
@@ -455,9 +456,12 @@ public class ClanChatPlugin extends Plugin
@Subscribe @Subscribe
public void onPlayerSpawned(PlayerSpawned event) public void onPlayerSpawned(PlayerSpawned event)
{ {
if (event.getPlayer().isClanMember()) final Player local = client.getLocalPlayer();
final Player player = event.getPlayer();
if (player != local && player.isClanMember())
{ {
clanMembers.add(event.getPlayer()); clanMembers.add(player);
addClanCounter(); addClanCounter();
} }
} }