From bca9403dc979e86dc8d4f95431e77b75f5e42e4d Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Thu, 6 Dec 2018 21:38:07 -0500
Subject: [PATCH] world switcher: fix race with fetching worlds while pinging

---
 .../client/plugins/worldhopper/WorldHopperPlugin.java         | 2 +-
 .../client/plugins/worldhopper/WorldSwitcherPanel.java        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java
index 7242cce3f0..83a7b0cc11 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java
@@ -741,7 +741,7 @@ public class WorldHopperPlugin extends Plugin
 		for (World world : worldResult.getWorlds())
 		{
 			int ping = Ping.ping(world);
-			SwingUtilities.invokeLater(() -> panel.updatePing(world, ping));
+			SwingUtilities.invokeLater(() -> panel.updatePing(world.getId(), ping));
 		}
 
 		stopwatch.stop();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java
index b74f2c229f..5bd72fff32 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java
@@ -113,11 +113,11 @@ class WorldSwitcherPanel extends PluginPanel
 		}
 	}
 
-	void updatePing(World world, int ping)
+	void updatePing(int world, int ping)
 	{
 		for (WorldTableRow worldTableRow : rows)
 		{
-			if (worldTableRow.getWorld() == world)
+			if (worldTableRow.getWorld().getId() == world)
 			{
 				worldTableRow.setPing(ping);