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

Bug Fixes

Browse Source 
Signed-off-by: PKLite <stonewall@pklite.xyz>
This commit is contained in:
PKLite
2019-07-03 14:02:41 -04:00
parent 1e80b0ef14
commit d8fbd902cc
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
View File

@@ -259,6 +259,11 @@ public class LootTrackerPlugin extends Plugin
ignoredItems = Text.fromCSV(config.getIgnoredItems()); ignoredItems = Text.fromCSV(config.getIgnoredItems());
SwingUtilities.invokeLater(panel::updateIgnoredRecords); SwingUtilities.invokeLater(panel::updateIgnoredRecords);
} }
if (event.getKey().equals("ignoredNPCs"))
{
ignoredNPCs = Text.fromCSV(config.getIgnoredNPCs());
SwingUtilities.invokeLater(panel::updateIgnoredRecords);
}
if (event.getKey().equals("sortType")) if (event.getKey().equals("sortType"))
{ {
panel.setLootRecordSortType(config.sortType()); panel.setLootRecordSortType(config.sortType());
@@ -304,20 +309,9 @@ public class LootTrackerPlugin extends Plugin
executor.submit(() -> executor.submit(() ->
{ {
if (config.syncPanel())
if (config.syncPanel() && lootTrackerClient != null)
{ {
lootTrackerClient = new LootTrackerClient(accountSession.getUuid()); lootTrackerClient = new LootTrackerClient(accountSession.getUuid());
try
{
lootRecords = lootTrackerClient.get();
}
catch (IOException e)
{
log.debug("Unable to look up loot", e);
return;
}
log.debug("Loaded {} remote data entries", lootRecords.size());
} }
if (config.localPersistence()) if (config.localPersistence())
@@ -392,7 +386,7 @@ public class LootTrackerPlugin extends Plugin
LootRecord lootRecord = new LootRecord(name, localUsername, LootRecordType.NPC, LootRecord lootRecord = new LootRecord(name, localUsername, LootRecordType.NPC,
toGameItems(items), Instant.now()); toGameItems(items), Instant.now());
if (lootTrackerClient != null && config.saveLoot()) if (config.saveLoot() && lootTrackerClient != null)
{ {
lootTrackerClient.submit(lootRecord); lootTrackerClient.submit(lootRecord);
} }
@@ -416,7 +410,8 @@ public class LootTrackerPlugin extends Plugin
{ {
if (config.sendLootValueMessages()) if (config.sendLootValueMessages())
{ {
if (WorldType.isDeadmanWorld(client.getWorldType()) || WorldType.isHighRiskWorld(client.getWorldType()) || WorldType.isPvpWorld(client.getWorldType()) || client.getVar(Varbits.IN_WILDERNESS) == 1) if (WorldType.isDeadmanWorld(client.getWorldType()) || WorldType.isHighRiskWorld(client.getWorldType()) ||
WorldType.isPvpWorld(client.getWorldType()) || client.getVar(Varbits.IN_WILDERNESS) == 1)
{ {
final String totalValue = StackFormatter.quantityToRSStackSize(playerLootReceived.getItems().stream() final String totalValue = StackFormatter.quantityToRSStackSize(playerLootReceived.getItems().stream()
.mapToInt(itemStack -> itemManager.getItemPrice(itemStack.getId()) * itemStack.getQuantity()).sum()); .mapToInt(itemStack -> itemManager.getItemPrice(itemStack.getId()) * itemStack.getQuantity()).sum());
@@ -439,7 +434,7 @@ public class LootTrackerPlugin extends Plugin
{ {
lootTrackerClient.submit(lootRecord); lootTrackerClient.submit(lootRecord);
} }
if (config.localPersistence() && lootTrackerClient == null) if (config.localPersistence())
{ {
saveLocalLootRecord(lootRecord); saveLocalLootRecord(lootRecord);
} }
@@ -695,6 +690,7 @@ public class LootTrackerPlugin extends Plugin
{ {
try try
{ {
lootRecords.clear();
Files.deleteIfExists(LOOT_RECORDS_FILE.toPath()); Files.deleteIfExists(LOOT_RECORDS_FILE.toPath());
} }
catch (IOException e) catch (IOException e)
@@ -800,16 +796,13 @@ public class LootTrackerPlugin extends Plugin
public void toggleNPC(String name, boolean ignore) public void toggleNPC(String name, boolean ignore)
{ {
final Set<String> ignoredNPCSet = new HashSet<>(ignoredNPCs); final Set<String> ignoredNPCSet = new HashSet<>(ignoredNPCs);
if (ignore) if (ignore)
{ {
ignoredNPCSet.add(name); ignoredNPCSet.add(name);
ignoredNPCs.add(name);
} }
else else
{ {
ignoredNPCSet.remove(name); ignoredNPCSet.remove(name);
ignoredNPCs.remove(name);
} }
config.setIgnoredNPCs(Text.toCSV(ignoredNPCSet)); config.setIgnoredNPCs(Text.toCSV(ignoredNPCSet));
@@ -823,7 +816,6 @@ public class LootTrackerPlugin extends Plugin
*/ */
public boolean isIgnoredNPC(String name) public boolean isIgnoredNPC(String name)
{ {
log.info(ignoredNPCs.toString());
return ignoredNPCs.contains(name); return ignoredNPCs.contains(name);
} }