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

Merge branch 'master' of https://github.com/runelite/runelite into workpls

Browse Source 
# Conflicts:
#	runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java
This commit is contained in:
James Munson
2019-04-24 17:27:50 -07:00
parent 7498ca24c4 2ac0139e55
commit eaacc5ef23
3 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
View File

@@ -121,6 +121,7 @@ public class WidgetID
public static final int MINIGAME_TAB_ID = 76; public static final int MINIGAME_TAB_ID = 76;
public static final int SPELLBOOK_GROUP_ID = 218; public static final int SPELLBOOK_GROUP_ID = 218;
public static final int PVP_GROUP_ID = 90; public static final int PVP_GROUP_ID = 90;
public static final int FISHING_TRAWLER_GROUP_ID = 366;
public static final int ZEAH_MESS_HALL_GROUP_ID = 235; public static final int ZEAH_MESS_HALL_GROUP_ID = 235;
public static final int KOUREND_FAVOUR_GROUP_ID = 246; public static final int KOUREND_FAVOUR_GROUP_ID = 246;
public static final int LOOTING_BAG_GROUP_ID = 81; public static final int LOOTING_BAG_GROUP_ID = 81;

33
runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
View File

@@ -92,18 +92,26 @@ public class ClanChatPlugin extends Plugin
} }
@Subscribe @Subscribe
public void onClanMemberJoined(final ClanMemberJoined event) { public void onClanMemberJoined(ClanMemberJoined event)
{
final ClanMember member = event.getMember(); final ClanMember member = event.getMember();
if (member.getWorld() == this.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 : this.client.getPlayers()) {
if (player != null && memberName.equals(Text.toJagexName(player.getName()))) { for (final Player player : client.getPlayers())
ClanChatPlugin.clanMembers.add(player); {
this.addClanCounter(); if (player != null && player != local && memberName.equals(Text.toJagexName(player.getName())))
{
clanMembers.add(player);
addClanCounter();
break; break;
} }
} }
} }
if (this.clanJoinedTick == this.client.getTickCount()) { if (this.clanJoinedTick == this.client.getTickCount()) {
return; return;
} }
@@ -293,10 +301,15 @@ public class ClanChatPlugin extends Plugin
} }
@Subscribe @Subscribe
public void onPlayerSpawned(final PlayerSpawned event) { public void onPlayerSpawned(PlayerSpawned event)
if (event.getPlayer().isClanMember()) { {
ClanChatPlugin.clanMembers.add(event.getPlayer()); final Player local = client.getLocalPlayer();
this.addClanCounter(); final Player player = event.getPlayer();
if (player != local && player.isClanMember())
{
clanMembers.add(player);
addClanCounter();
} }
} }

11
runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java
View File

@@ -104,4 +104,15 @@ public interface NpcAggroAreaConfig extends Config
{ {
return true; return true;
} }
@ConfigItem(
keyName = "npcUnaggroShowNotWorkingOverlay",
name = "Hide overlay hint",
description = "Hide overlay hint if plugin is enabled in unsupported area",
position = 6
)
default boolean hideOverlayHint()
{
return false;
}
} }