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

Merge branch 'master-2'

Browse Source 
finishes merge

# Conflicts:
#	http-service/src/main/java/net/runelite/http/service/config/ConfigService.java
#	http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java
#	http-service/src/test/java/net/runelite/http/service/config/ConfigControllerTest.java
#	http-service/src/test/java/net/runelite/http/service/loottracker/LootTrackerControllerTest.java
#	injector-plugin/src/test/java/net/runelite/injector/InjectTest.java
#	runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
#	runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java
#	runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java
This commit is contained in:
Zeruth
2019-07-12 16:34:04 -04:00
parent 0731a11198 06f4d620ad
commit 1cb65fb1e0
29 changed files with 165 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-client/src/test/java/net/runelite/client/plugins/motherlode/MotherlodePluginTest.java
View File

@@ -116,7 +116,7 @@ public class MotherlodePluginTest
{
// set inMlm
GameStateChanged gameStateChanged = new GameStateChanged();
gameStateChanged.setGameState(GameState.LOGGED_IN);
gameStateChanged.setGameState(GameState.LOADING);
motherlodePlugin.onGameStateChanged(gameStateChanged);
// Initial sack count
@@ -178,4 +178,4 @@ public class MotherlodePluginTest
when(item.getQuantity()).thenReturn(quantity);
return item;
}
}
}