2 files changed, 18 insertions, 6 deletions
diff --git a/src/main/java/de/cowtipper/cowlection/data/DataHelper.java b/src/main/java/de/cowtipper/cowlection/data/DataHelper.java
index ee2abe3..714a87d 100644
--- a/src/main/java/de/cowtipper/cowlection/data/DataHelper.java
+++ b/src/main/java/de/cowtipper/cowlection/data/DataHelper.java
@@ -4,11 +4,11 @@ import com.google.gson.annotations.SerializedName;
 import de.cowtipper.cowlection.util.Utils;
 import net.minecraft.util.EnumChatFormatting;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 public final class DataHelper {
+    public static final Set<String> AMBIGUOUS_ITEM_IDS = new HashSet<>(Arrays.asList("ENCHANTED_BOOK", "RUNE", "PET", "POTION", "NEW_YEAR_CAKE", "SPOOKY_PIE", "CAKE_SOUL"));
+
     private DataHelper() {
     }
 
diff --git a/src/main/java/de/cowtipper/cowlection/data/HySkyBlockStats.java b/src/main/java/de/cowtipper/cowlection/data/HySkyBlockStats.java
index 2fa802b..4bf5093 100644
--- a/src/main/java/de/cowtipper/cowlection/data/HySkyBlockStats.java
+++ b/src/main/java/de/cowtipper/cowlection/data/HySkyBlockStats.java
@@ -220,12 +220,16 @@ public class HySkyBlockStats {
             }
 
             public List<Pet> getPets() {
-                pets.sort((p1, p2) -> ComparisonChain.start().compare(p2.active, p1.active).compare(p2.getRarity(), p1.getRarity()).compare(p2.exp, p1.exp).result());
+                if (pets == null) {
+                    pets = Collections.emptyList();
+                } else {
+                    pets.sort((p1, p2) -> ComparisonChain.start().compare(p2.active, p1.active).compare(p2.getRarity(), p1.getRarity()).compare(p2.exp, p1.exp).result());
+                }
                 return pets;
             }
 
             public Pet getActivePet() {
-                for (Pet pet : pets) {
+                for (Pet pet : getPets()) {
                     if (pet.isActive()) {
                         return pet;
                     }
@@ -234,7 +238,7 @@ public class HySkyBlockStats {
             }
 
             public Pet getPet(String type) {
-                for (Pet pet : pets) {
+                for (Pet pet : getPets()) {
                     if (type.equals(pet.type)) {
                         return pet;
                     }
@@ -298,6 +302,14 @@ public class HySkyBlockStats {
                 return active;
             }
 
+            public String getType() {
+                return type;
+            }
+
+            public double getExp() {
+                return exp;
+            }
+
             public DataHelper.SkyBlockRarity getRarity() {
                 return DataHelper.SkyBlockRarity.valueOf(tier);
             }