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

loottracker: prevent null events

Browse Source 
Also detect and log null events from the clue scroll reward interface
This commit is contained in:
Adam
2020-02-13 10:39:49 -05:00
parent 9d908110b8
commit e737d73257
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,7 @@ import javax.inject.Inject;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.ChatMessageType; import net.runelite.api.ChatMessageType;
import net.runelite.api.Client; import net.runelite.api.Client;
@@ -345,7 +346,7 @@ public class LootTrackerPlugin extends Plugin
} }
} }
void addLoot(String name, int combatLevel, LootRecordType type, Collection<ItemStack> items) void addLoot(@NonNull String name, int combatLevel, LootRecordType type, Collection<ItemStack> items)
{ {
final LootTrackerItem[] entries = buildEntries(stack(items)); final LootTrackerItem[] entries = buildEntries(stack(items));
SwingUtilities.invokeLater(() -> panel.add(name, type, combatLevel, entries)); SwingUtilities.invokeLater(() -> panel.add(name, type, combatLevel, entries));
@@ -429,6 +430,12 @@ public class LootTrackerPlugin extends Plugin
// Clue Scrolls use same InventoryID as Barrows // Clue Scrolls use same InventoryID as Barrows
event = eventType; event = eventType;
container = client.getItemContainer(InventoryID.BARROWS_REWARD); container = client.getItemContainer(InventoryID.BARROWS_REWARD);
if (event == null)
{
log.debug("Clue scroll reward interface with no event!");
return;
}
break; break;
case (WidgetID.KINGDOM_GROUP_ID): case (WidgetID.KINGDOM_GROUP_ID):
event = "Kingdom of Miscellania"; event = "Kingdom of Miscellania";

2
runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerRecord.java
View File

@@ -24,12 +24,14 @@
*/ */
package net.runelite.client.plugins.loottracker; package net.runelite.client.plugins.loottracker;
import lombok.NonNull;
import lombok.Value; import lombok.Value;
import net.runelite.http.api.loottracker.LootRecordType; import net.runelite.http.api.loottracker.LootRecordType;
@Value @Value
class LootTrackerRecord class LootTrackerRecord
{ {
@NonNull
private final String title; private final String title;
private final String subTitle; private final String subTitle;
private final LootRecordType type; private final LootRecordType type;