aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/util/ItemUtils.java24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/ItemUtils.java b/src/main/java/io/github/moulberry/notenoughupdates/util/ItemUtils.java
index bc44f656..f8f42b80 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/ItemUtils.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/ItemUtils.java
@@ -287,16 +287,20 @@ public class ItemUtils {
if (secondLastBlankLine != -1) {
List<String> petItemLore = new ArrayList<>();
if (heldItem != null) {
- petItemLore.add(EnumChatFormatting.GOLD + "Held Item: " + heldItemJson.get("displayname").getAsString());
- List<String> heldItemLore = JsonUtils.getJsonArrayOrEmpty(heldItemJson, "lore", JsonElement::getAsString);
- int blanks = 0;
- for (String heldItemLoreLine : heldItemLore) {
- if (heldItemLoreLine.trim().isEmpty()) {
- blanks++;
- } else if (blanks == 2) {
- petItemLore.add(heldItemLoreLine);
- } else if (blanks > 2) {
- break;
+ if (heldItemJson == null) {
+ petItemLore.add(EnumChatFormatting.RED + "Could not find held item in repo!");
+ } else {
+ petItemLore.add(EnumChatFormatting.GOLD + "Held Item: " + heldItemJson.get("displayname").getAsString());
+ List<String> heldItemLore = JsonUtils.getJsonArrayOrEmpty(heldItemJson, "lore", JsonElement::getAsString);
+ int blanks = 0;
+ for (String heldItemLoreLine : heldItemLore) {
+ if (heldItemLoreLine.trim().isEmpty()) {
+ blanks++;
+ } else if (blanks == 2) {
+ petItemLore.add(heldItemLoreLine);
+ } else if (blanks > 2) {
+ break;
+ }
}
}
}