From b10e55a26649a5b574c3296e055111c1094174c5 Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Tue, 9 Feb 2021 03:22:47 -0500
Subject: [PATCH] Better solution for 62ccaa1d4ac67a1e3276130c518087d00a8927f1

---
 .../quests/requirements/RequirementsPrompt.java    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/main/src/main/java/me/blackvein/quests/convo/quests/requirements/RequirementsPrompt.java b/main/src/main/java/me/blackvein/quests/convo/quests/requirements/RequirementsPrompt.java
index 9f17bc2e2..159e71034 100644
--- a/main/src/main/java/me/blackvein/quests/convo/quests/requirements/RequirementsPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/quests/requirements/RequirementsPrompt.java
@@ -654,10 +654,6 @@ public class RequirementsPrompt extends QuestsEditorNumericPrompt {
                 } else {
                     String text = "\n";
                     for (final ItemStack is : (List<ItemStack>) context.getSessionData(CK.REQ_ITEMS)) {
-                        if (is == null) {
-                            // TODO - Find out why this happens after first setting GUI Display
-                            return ChatColor.GRAY + "(" + Lang.get("noneSet") + ")";
-                        }
                         text += ChatColor.GRAY + "     - " + ItemUtil.getDisplayString(is) + "\n";
                     }
                     return text;
@@ -692,11 +688,17 @@ public class RequirementsPrompt extends QuestsEditorNumericPrompt {
             if (context.getSessionData("newItem") != null) {
                 if (context.getSessionData(CK.REQ_ITEMS) != null) {
                     final List<ItemStack> itemReqs = (List<ItemStack>) context.getSessionData(CK.REQ_ITEMS);
-                    itemReqs.add((ItemStack) context.getSessionData("tempStack"));
+                    final ItemStack i = (ItemStack) context.getSessionData("tempStack");
+                    if (i != null) {
+                        itemReqs.add((ItemStack) context.getSessionData("tempStack"));
+                    }
                     context.setSessionData(CK.REQ_ITEMS, itemReqs);
                 } else {
                     final LinkedList<ItemStack> itemReqs = new LinkedList<ItemStack>();
-                    itemReqs.add((ItemStack) context.getSessionData("tempStack"));
+                    final ItemStack i = (ItemStack) context.getSessionData("tempStack");
+                    if (i != null) {
+                        itemReqs.add((ItemStack) context.getSessionData("tempStack"));
+                    }
                     context.setSessionData(CK.REQ_ITEMS, itemReqs);
                 }
                 context.setSessionData("newItem", null);