From d25e8e97311e86af7a97016cccc02bb38f92c809 Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 15:28:17 +0200 Subject: [PATCH] loottracker: Null checks --- .../client/plugins/loottracker/LootTrackerPlugin.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index cdcfff42d0..cc82e8dae6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -51,6 +51,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.concurrent.ScheduledExecutorService; import java.util.regex.Matcher; @@ -322,7 +323,10 @@ public class LootTrackerPlugin extends Plugin if (this.syncPanel && lootTrackerClient != null) { - lootTrackerClient = new LootTrackerClient(accountSession.getUuid()); + if (accountSession != null) + { + lootTrackerClient = new LootTrackerClient(accountSession.getUuid()); + } try { lootRecords = lootTrackerClient.get(); @@ -628,7 +632,7 @@ public class LootTrackerPlugin extends Plugin Multiset currentInventory = HashMultiset.create(); if (inventory != null) { - Arrays.stream(client.getItemContainer(InventoryID.INVENTORY).getItems()) + Arrays.stream(Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems()) .forEach(item -> currentInventory.add(item.getId(), item.getQuantity())); }