From 6f5a719cfb59243bd6268cf0d164911e2f219892 Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Sat, 23 Nov 2019 16:52:09 -0500
Subject: [PATCH] world client: always return non null or throw an error

---
 .../net/runelite/http/api/worlds/WorldClient.java    |  2 +-
 .../plugins/defaultworld/DefaultWorldPlugin.java     |  7 -------
 .../plugins/worldhopper/WorldHopperPlugin.java       | 12 ++++--------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/http-api/src/main/java/net/runelite/http/api/worlds/WorldClient.java b/http-api/src/main/java/net/runelite/http/api/worlds/WorldClient.java
index 8e08d0c9b1..b9d84eefd9 100644
--- a/http-api/src/main/java/net/runelite/http/api/worlds/WorldClient.java
+++ b/http-api/src/main/java/net/runelite/http/api/worlds/WorldClient.java
@@ -67,7 +67,7 @@ public class WorldClient
 			if (!response.isSuccessful())
 			{
 				logger.debug("Error looking up worlds: {}", response);
-				return null;
+				throw new IOException("unsuccessful response looking up worlds");
 			}
 
 			InputStream in = response.body().byteStream();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java
index 1f97074772..eed2830ae1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java
@@ -119,13 +119,6 @@ public class DefaultWorldPlugin extends Plugin
 		try
 		{
 			final WorldResult worldResult = worldClient.lookupWorlds();
-
-			if (worldResult == null)
-			{
-				log.warn("Failed to lookup worlds.");
-				return;
-			}
-
 			final World world = worldResult.findWorld(correctedWorld);
 
 			if (world != null)
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 5e397a23f8..98c8e39a27 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
@@ -514,14 +514,10 @@ public class WorldHopperPlugin extends Plugin
 		try
 		{
 			WorldResult worldResult = worldClient.lookupWorlds();
-
-			if (worldResult != null)
-			{
-				worldResult.getWorlds().sort(Comparator.comparingInt(World::getId));
-				this.worldResult = worldResult;
-				this.lastFetch = Instant.now();
-				updateList();
-			}
+			worldResult.getWorlds().sort(Comparator.comparingInt(World::getId));
+			this.worldResult = worldResult;
+			this.lastFetch = Instant.now();
+			updateList();
 		}
 		catch (IOException ex)
 		{