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

xp tracker plugin: don't throw from startUp if unable to fetch worlds

Browse Source
This commit is contained in:
Adam
2018-04-11 21:44:43 -04:00
parent 88152c4dcf
commit d9143aa8e7
1 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
View File

@@ -24,6 +24,7 @@
*/ */
package net.runelite.client.plugins.xptracker; package net.runelite.client.plugins.xptracker;
import static com.google.common.base.MoreObjects.firstNonNull;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import com.google.inject.Binder; import com.google.inject.Binder;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
@@ -97,7 +98,14 @@ public class XpTrackerPlugin extends Plugin
try try
{ {
worlds = worldClient.lookupWorlds(); worlds = worldClient.lookupWorlds();
log.debug("Worlds list contains {} worlds", worlds.getWorlds().size()); if (worlds != null)
{
log.debug("Worlds list contains {} worlds", worlds.getWorlds().size());
}
else
{
log.warn("Unable to look up worlds");
}
} }
catch (IOException e) catch (IOException e)
{ {
@@ -134,21 +142,15 @@ public class XpTrackerPlugin extends Plugin
{ {
// LOGGED_IN is triggered between region changes too. // LOGGED_IN is triggered between region changes too.
// Check that the username changed or the world type changed. // Check that the username changed or the world type changed.
World world = worlds.findWorld(client.getWorld()); XpWorldType type = getWorldType(client.getWorld());
if (world == null)
{
log.warn("Logged into nonexistent world {}?", client.getWorld());
return;
}
XpWorldType type = worldSetToType(world.getTypes());
if (!Objects.equals(client.getUsername(), lastUsername) || lastWorldType != type) if (!Objects.equals(client.getUsername(), lastUsername) || lastWorldType != type)
{ {
// Reset // Reset
log.debug("World change: {} -> {}, {} -> {}", log.debug("World change: {} -> {}, {} -> {}",
lastUsername, client.getUsername(), lastWorldType, type); lastUsername, client.getUsername(),
firstNonNull(lastWorldType, "<unknown>"),
firstNonNull(type, "<unknown>"));
lastUsername = client.getUsername(); lastUsername = client.getUsername();
lastWorldType = type; lastWorldType = type;
@@ -178,6 +180,25 @@ public class XpTrackerPlugin extends Plugin
} }
} }
private XpWorldType getWorldType(int worldNum)
{
if (worlds == null)
{
return null;
}
World world = worlds.findWorld(worldNum);
if (world == null)
{
log.warn("Logged into nonexistent world {}?", client.getWorld());
return null;
}
XpWorldType type = worldSetToType(world.getTypes());
return type;
}
private XpWorldType worldSetToType(EnumSet<WorldType> types) private XpWorldType worldSetToType(EnumSet<WorldType> types)
{ {
XpWorldType xpType = NORMAL; XpWorldType xpType = NORMAL;