loottracker: Null checks

This commit is contained in:
sdburns1998
2019-07-07 15:28:17 +02:00
parent 1c62a8ef0a
commit d25e8e9731

View File

@@ -51,6 +51,7 @@ import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@@ -322,7 +323,10 @@ public class LootTrackerPlugin extends Plugin
if (this.syncPanel && lootTrackerClient != null) if (this.syncPanel && lootTrackerClient != null)
{ {
lootTrackerClient = new LootTrackerClient(accountSession.getUuid()); if (accountSession != null)
{
lootTrackerClient = new LootTrackerClient(accountSession.getUuid());
}
try try
{ {
lootRecords = lootTrackerClient.get(); lootRecords = lootTrackerClient.get();
@@ -628,7 +632,7 @@ public class LootTrackerPlugin extends Plugin
Multiset<Integer> currentInventory = HashMultiset.create(); Multiset<Integer> currentInventory = HashMultiset.create();
if (inventory != null) 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())); .forEach(item -> currentInventory.add(item.getId(), item.getQuantity()));
} }