Merge remote-tracking branch 'runelite/master'

runelite-client/runelite-client.gradle.kts

@@ -62,9 +62,9 @@ dependencies {
     implementation(group = "com.jakewharton.rxrelay3", name = "rxrelay", version = "3.0.0")
     implementation(group = "com.squareup.okhttp3", name = "okhttp", version = "3.7.0")
     implementation(group = "io.reactivex.rxjava3", name = "rxjava", version = "3.0.10")
-    implementation(group = "net.java.dev.jna", name = "jna", version = "5.8.0")
+    implementation(group = "net.java.dev.jna", name = "jna", version = "5.9.0")
     implementation(group = "org.jgroups", name = "jgroups", version = "5.0.4.Final")
-    implementation(group = "net.java.dev.jna", name = "jna-platform", version = "5.8.0")
+    implementation(group = "net.java.dev.jna", name = "jna-platform", version = "5.9.0")
     implementation(group = "net.runelite", name = "discord", version = "1.4")
     implementation(group = "net.runelite.pushingpixels", name = "substance", version = "8.0.02")
     implementation(group = "net.sf.jopt-simple", name = "jopt-simple", version = "5.0.1")

runelite-client/src/main/java/net/runelite/client/game/npcoverlay/NpcOverlayService.java

@@ -33,7 +33,9 @@ import java.util.function.Function;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.api.Client;
+import net.runelite.api.GameState;
 import net.runelite.api.NPC;
+import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.NpcChanged;
 import net.runelite.api.events.NpcDespawned;
 import net.runelite.api.events.NpcSpawned;
@@ -62,6 +64,16 @@ public class NpcOverlayService
 		eventBus.register(this);
 	}
 
+	@Subscribe
+	private void onGameStateChanged(GameStateChanged event)
+	{
+		if (event.getGameState() == GameState.LOGIN_SCREEN ||
+			event.getGameState() == GameState.HOPPING)
+		{
+			highlightedNpcs.clear();
+		}
+	}
+
 	@Subscribe(
 		// Run after plugins, which typically capture NPCs on spawn and reference them in the highlight functions
 		priority = -1
@@ -81,14 +93,18 @@ public class NpcOverlayService
 		}
 	}
 
-	@Subscribe
+	@Subscribe(
+		priority = -1
+	)
 	private void onNpcDespawned(NpcDespawned npcDespawned)
 	{
 		final NPC npc = npcDespawned.getNpc();
 		highlightedNpcs.remove(npc);
 	}
 
-	@Subscribe
+	@Subscribe(
+		priority = -1
+	)
 	private void onNpcChanged(NpcChanged event)
 	{
 		final NPC npc = event.getNpc();

runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java

@@ -186,7 +186,7 @@ public class MusicPlugin extends Plugin
 			channels = new Channel[]{musicChannel, effectChannel, areaChannel};
 
 			addMusicButtons();
-			if (musicConfig.granularSliders())
+			if (client.getGameState() == GameState.LOGGED_IN && musicConfig.granularSliders())
 			{
 				updateMusicOptions();
 				resetSettingsWindow();

runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/ping/RLLibC.java

@@ -41,8 +41,6 @@ interface RLLibC extends LibC
 
 	int socket(int domain, int type, int protocol);
 
-	int close(int socket);
-
 	int sendto(int sockfd, byte[] buf, int len, int flags, byte[] dest_addr, int addrlen);
 
 	int recvfrom(int sockfd, Pointer buf, int len, int flags, Pointer src_addr, Pointer addrlen);

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

@@ -47,7 +47,7 @@ public class WidgetOverlay extends Overlay
 			// The client forces the oxygen bar below the xp tracker, so set its priority lower
 			new WidgetOverlay(client, WidgetInfo.FOSSIL_ISLAND_OXYGENBAR, OverlayPosition.TOP_CENTER, OverlayPriority.HIGH),
 			new XpTrackerWidgetOverlay(overlayManager, client, WidgetInfo.EXPERIENCE_TRACKER_WIDGET, OverlayPosition.TOP_RIGHT),
-			new WidgetOverlay(client, WidgetInfo.RAIDS_POINTS_INFOBOX, OverlayPosition.TOP_RIGHT),
+			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_STATS, OverlayPosition.TOP_LEFT),
 			new WidgetOverlay(client, WidgetInfo.GWD_KC, OverlayPosition.TOP_RIGHT),