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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2021-10-25 00:47:41 +02:00
parent 5c19e731fa 455e75b7bc
commit 0a220102f1
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runelite-api/src/main/java/net/runelite/api/events/ClanChannelChanged.java
View File

@@ -39,6 +39,11 @@ public class ClanChannelChanged
*/ */
@Nullable @Nullable
private final ClanChannel clanChannel; private final ClanChannel clanChannel;
/**
* The clan id, or -1 for guest clan
* @see net.runelite.api.clan.ClanID
*/
private int clanId;
/** /**
* Whether or not this was the guest clan channel * Whether or not this was the guest clan channel
*/ */

2
runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
View File

@@ -1875,6 +1875,8 @@ public class ChatCommandsPlugin extends Plugin
case "dusk": case "dusk":
case "dawn": case "dawn":
case "gargs": case "gargs":
case "ggs":
case "gg":
return "Grotesque Guardians"; return "Grotesque Guardians";
case "crazy arch": case "crazy arch":

3
runelite-client/src/main/java/net/runelite/client/plugins/team/TeamPlugin.java
View File

@@ -45,6 +45,7 @@ import net.runelite.api.Player;
import net.runelite.api.SpriteID; import net.runelite.api.SpriteID;
import net.runelite.api.clan.ClanChannel; import net.runelite.api.clan.ClanChannel;
import net.runelite.api.clan.ClanChannelMember; import net.runelite.api.clan.ClanChannelMember;
import net.runelite.api.clan.ClanID;
import net.runelite.api.events.ClanChannelChanged; import net.runelite.api.events.ClanChannelChanged;
import net.runelite.api.events.ClanMemberJoined; import net.runelite.api.events.ClanMemberJoined;
import net.runelite.api.events.ClanMemberLeft; import net.runelite.api.events.ClanMemberLeft;
@@ -290,7 +291,7 @@ public class TeamPlugin extends Plugin
@Subscribe @Subscribe
public void onClanChannelChanged(ClanChannelChanged event) public void onClanChannelChanged(ClanChannelChanged event)
{ {
if (!event.isGuest()) if (event.getClanId() == ClanID.CLAN)
{ {
removeClanChatCounter(); removeClanChatCounter();
clanChatCount = 0; clanChatCount = 0;

2
runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java
View File

@@ -50,7 +50,7 @@ public class WidgetOverlay extends Overlay
new WidgetOverlay(client, WidgetInfo.RAIDS_POINTS_INFOBOX, OverlayPosition.TOP_LEFT), new WidgetOverlay(client, WidgetInfo.RAIDS_POINTS_INFOBOX, OverlayPosition.TOP_LEFT),
new WidgetOverlay(client, WidgetInfo.TOB_PARTY_INTERFACE, OverlayPosition.TOP_LEFT), new WidgetOverlay(client, WidgetInfo.TOB_PARTY_INTERFACE, OverlayPosition.TOP_LEFT),
new WidgetOverlay(client, WidgetInfo.TOB_PARTY_STATS, OverlayPosition.TOP_LEFT), new WidgetOverlay(client, WidgetInfo.TOB_PARTY_STATS, OverlayPosition.TOP_LEFT),
new WidgetOverlay(client, WidgetInfo.GWD_KC, OverlayPosition.TOP_RIGHT), new WidgetOverlay(client, WidgetInfo.GWD_KC, OverlayPosition.TOP_LEFT),
new WidgetOverlay(client, WidgetInfo.TITHE_FARM, OverlayPosition.TOP_RIGHT), new WidgetOverlay(client, WidgetInfo.TITHE_FARM, OverlayPosition.TOP_RIGHT),
new WidgetOverlay(client, WidgetInfo.PEST_CONTROL_BOAT_INFO, OverlayPosition.TOP_LEFT), new WidgetOverlay(client, WidgetInfo.PEST_CONTROL_BOAT_INFO, OverlayPosition.TOP_LEFT),
new WidgetOverlay(client, WidgetInfo.PEST_CONTROL_KNIGHT_INFO_CONTAINER, OverlayPosition.TOP_LEFT), new WidgetOverlay(client, WidgetInfo.PEST_CONTROL_KNIGHT_INFO_CONTAINER, OverlayPosition.TOP_LEFT),