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

Merge pull request #2325 from open-osrs/clanranks-soundsplugin

Browse Source 
clanranks-sounds: Fix clan ranks, fix sounds after rx conversion
This commit is contained in:
Tyler Bochard
2020-02-09 17:20:43 -05:00
committed by GitHub
parent 8c5b28cdf8 2a8c3d4e3d
commit 5f2017c9ea
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/game/ClanManager.java
View File

@@ -134,7 +134,7 @@ public class ClanManager
private void onGameStateChanged(GameStateChanged gameStateChanged)
{
if (gameStateChanged.getGameState() == GameState.LOGIN_SCREEN && offset == 0)
if (gameStateChanged.getGameState() == GameState.LOGGED_IN && offset == 0)
{
loadClanChatIcons();
}

13
runelite-client/src/main/java/net/runelite/client/plugins/sounds/SoundsPlugin.java
View File

@@ -65,13 +65,16 @@ public class SoundsPlugin extends Plugin
{
if (event.getNpcid() != -1)
{
if (ArrayUtils.contains(sounds.get(event.getNpcid()), event.getSoundId()))
if (sounds != null)
{
return;
if (ArrayUtils.contains(sounds.get(event.getNpcid()), event.getSoundId()))
{
return;
}
int[] newSounds = ArrayUtils.add(sounds.get(event.getNpcid()), event.getSoundId());
sounds.put(event.getNpcid(), newSounds);
soundsClient.submit(event.getNpcid(), event.getSoundId());
}
int[] newSounds = ArrayUtils.add(sounds.get(event.getNpcid()), event.getSoundId());
sounds.put(event.getNpcid(), newSounds);
soundsClient.submit(event.getNpcid(), event.getSoundId());
}
}
}