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

Properly update MLM sack values on login/logout (#6627)

Browse Source 
- Prevent unnecessary code execution while logged out
- Fix inventory size on initial login
- Refresh sack values on initial login
This commit is contained in:
TheStonedTurtle
2018-11-23 04:14:17 -08:00
committed by Tomas Slusny
parent 6c1169c776
commit 3c533c6136
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java
View File

@@ -87,6 +87,8 @@ public class MotherlodePlugin extends Plugin
ItemID.MITHRIL_ORE, ItemID.GOLD_ORE, ItemID.COAL, ItemID.GOLDEN_NUGGET); ItemID.MITHRIL_ORE, ItemID.GOLD_ORE, ItemID.COAL, ItemID.GOLDEN_NUGGET);
private static final Set<Integer> ROCK_OBSTACLES = ImmutableSet.of(ROCKFALL, ROCKFALL_26680); private static final Set<Integer> ROCK_OBSTACLES = ImmutableSet.of(ROCKFALL, ROCKFALL_26680);
private static final int MAX_INVENTORY_SIZE = 28;
private static final int SACK_LARGE_SIZE = 162; private static final int SACK_LARGE_SIZE = 162;
private static final int SACK_SIZE = 81; private static final int SACK_SIZE = 81;
@@ -359,13 +361,18 @@ public class MotherlodePlugin extends Plugin
{ {
inMlm = checkInMlm(); inMlm = checkInMlm();
} }
else if (event.getGameState() == GameState.LOGIN_SCREEN)
{
// Prevent code from running while logged out.
inMlm = false;
}
} }
private Integer calculateDepositsLeft() private Integer calculateDepositsLeft()
{ {
if (maxSackSize == 0) // check if maxSackSize has been initialized if (maxSackSize == 0) // check if maxSackSize has been initialized
{ {
return null; refreshSackValues();
} }
double depositsLeft = 0; double depositsLeft = 0;
@@ -380,8 +387,6 @@ public class MotherlodePlugin extends Plugin
Item[] result = inventory.getItems(); Item[] result = inventory.getItems();
assert result != null; assert result != null;
int inventorySize = result.length;
for (Item item : result) for (Item item : result)
{ {
// Assume that MLM ores are being banked and exclude them from the check, // Assume that MLM ores are being banked and exclude them from the check,
@@ -394,7 +399,7 @@ public class MotherlodePlugin extends Plugin
} }
} }
double inventorySpace = inventorySize - nonPayDirtItems; double inventorySpace = MAX_INVENTORY_SIZE - nonPayDirtItems;
double sackSizeRemaining = maxSackSize - curSackSize; double sackSizeRemaining = maxSackSize - curSackSize;
if (inventorySpace > 0 && sackSizeRemaining > 0) if (inventorySpace > 0 && sackSizeRemaining > 0)