Merge remote-tracking branch 'runelite/master'

2021-07-21 19:16:23 +02:00
parent 699645fc22 2294703f08
commit 0188d9c416
41 changed files with 1877 additions and 78 deletions
--- a/runelite-client/src/test/java/net/runelite/client/plugins/grounditems/GroundItemsPluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/grounditems/GroundItemsPluginTest.java
@@ -111,6 +111,8 @@ public class GroundItemsPluginTest

 		when(client.getLocalPlayer()).thenReturn(mock(Player.class));
 		when(config.getHiddenItems()).thenReturn("");
+		when(config.showLootbeamForHighlighted()).thenReturn(false);
+		when(config.showLootbeamTier()).thenReturn(HighlightTier.OFF);
 	}

 	@Test