From 98f843627ce6db556eb95ff904529043f10efb6f Mon Sep 17 00:00:00 2001 From: psikoi Date: Thu, 16 Aug 2018 02:02:40 +0100 Subject: [PATCH] Fix highlighting wrong default world The default world plugin was running after the list was populated, by not highlighting any default world, only the current world after login, we unsure that it highlights the correct first world. --- .../runelite/client/plugins/worldhopper/WorldHopperPlugin.java | 2 ++ .../runelite/client/plugins/worldhopper/WorldSwitcherPanel.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 ea47ce5747..f698a2b1f5 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 @@ -44,6 +44,7 @@ import java.util.concurrent.TimeUnit; import javax.imageio.ImageIO; import javax.inject.Inject; import javax.swing.SwingUtilities; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; import net.runelite.api.ChatPlayer; @@ -124,6 +125,7 @@ public class WorldHopperPlugin extends Plugin private NavigationButton navButton; private WorldSwitcherPanel panel; + @Getter private int lastWorld; private int favoriteWorld1, favoriteWorld2; 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 a7c2902f3d..f8e9491056 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 @@ -177,7 +177,7 @@ class WorldSwitcherPanel extends PluginPanel for (int i = 0; i < worlds.size(); i++) { World world = worlds.get(i); - rows.add(buildRow(world, i % 2 == 0, world.getId() == plugin.getCurrentWorld(), plugin.isFavorite(world))); + rows.add(buildRow(world, i % 2 == 0, world.getId() == plugin.getCurrentWorld() && plugin.getLastWorld() != 0, plugin.isFavorite(world))); } updateList();