Merge pull request runelite#4941 from psikoi/world-hopper-activity-fix

World hopper activity ordering improvements
JustAPerson · Aug 18, 2018 · 1040171 · 1040171
2 parents cec942b + 3e9373c
commit 1040171
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...lite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java b/...lite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java
@@ -123,13 +123,19 @@ void updateList()
 				case PLAYERS:
 					return Integer.compare(r1.getUpdatedPlayerCount(), r2.getUpdatedPlayerCount()) * (ascendingOrder ? 1 : -1);
 				case ACTIVITY:
-					return r1.getWorld().getActivity().compareTo(r2.getWorld().getActivity()) * (ascendingOrder ? 1 : -1);
+					return r1.getWorld().getActivity().compareTo(r2.getWorld().getActivity()) * -1 * (ascendingOrder ? 1 : -1);
 				default:
 					return 0;
 
 			}
 		});
 
+		// Leave empty activity worlds on the bottom of the list
+		if (orderIndex == WorldOrder.ACTIVITY)
+		{
+			rows.sort((r1, r2) -> r1.getWorld().getActivity().equals("-") ? 1 : -1);
+		}
+
 		rows.sort((r1, r2) ->
 		{
 			boolean b1 = plugin.isFavorite(r1.getWorld());