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

world client: always return non null or throw an error

Browse Source
This commit is contained in:
Adam
2019-11-23 16:52:09 -05:00
parent 643a77ad26
commit 6f5a719cfb
3 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
http-api/src/main/java/net/runelite/http/api/worlds/WorldClient.java
View File

@@ -67,7 +67,7 @@ public class WorldClient
if (!response.isSuccessful()) if (!response.isSuccessful())
{ {
logger.debug("Error looking up worlds: {}", response); logger.debug("Error looking up worlds: {}", response);
return null; throw new IOException("unsuccessful response looking up worlds");
} }
InputStream in = response.body().byteStream(); InputStream in = response.body().byteStream();

7
runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java
View File

@@ -119,13 +119,6 @@ public class DefaultWorldPlugin extends Plugin
try try
{ {
final WorldResult worldResult = worldClient.lookupWorlds(); final WorldResult worldResult = worldClient.lookupWorlds();
if (worldResult == null)
{
log.warn("Failed to lookup worlds.");
return;
}
final World world = worldResult.findWorld(correctedWorld); final World world = worldResult.findWorld(correctedWorld);
if (world != null) if (world != null)

12
runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java
View File

@@ -514,14 +514,10 @@ public class WorldHopperPlugin extends Plugin
try try
{ {
WorldResult worldResult = worldClient.lookupWorlds(); WorldResult worldResult = worldClient.lookupWorlds();
worldResult.getWorlds().sort(Comparator.comparingInt(World::getId));
if (worldResult != null) this.worldResult = worldResult;
{ this.lastFetch = Instant.now();
worldResult.getWorlds().sort(Comparator.comparingInt(World::getId)); updateList();
this.worldResult = worldResult;
this.lastFetch = Instant.now();
updateList();
}
} }
catch (IOException ex) catch (IOException ex)
{ {