From f77100e7de022a218a91fc4200b5dff843c1f27d Mon Sep 17 00:00:00 2001
From: Alex 'mcmonkey' Goodwin <agoodwin@freneticllc.com>
Date: Wed, 17 Jun 2020 18:17:18 -0700
Subject: [PATCH] server.recipe_items: prevent bork from null choices

---
 .../denizen/events/item/ItemMoveScriptEvent.java     |  2 +-
 .../denizen/tags/core/ServerTagBase.java             | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemMoveScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemMoveScriptEvent.java
index a3a5e01201..633e20fb54 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemMoveScriptEvent.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/events/item/ItemMoveScriptEvent.java
@@ -35,7 +35,7 @@ public class ItemMoveScriptEvent extends BukkitScriptEvent implements Listener {
     // <context.item> returns the ItemTag that was moved.
     //
     // @Determine
-    // ItemTag to set a different item to be moved. NOTE: The original item will not be moved!
+    // ItemTag to set a different item to be moved.
     //
     // -->
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java
index ce2a2d7fd7..dcb5ca77a5 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java
@@ -237,11 +237,13 @@ public void serverTag(ReplaceableTagEvent event) {
             }
             ListTag result = new ListTag();
             Consumer<RecipeChoice> addChoice = (choice) -> {
-                if (choice instanceof RecipeChoice.ExactChoice) {
-                    result.addObject(new ItemTag(choice.getItemStack()));
-                }
-                else {
-                    result.add("material:" + choice.getItemStack().getType().name());
+                if (choice != null) {
+                    if (choice instanceof RecipeChoice.ExactChoice) {
+                        result.addObject(new ItemTag(choice.getItemStack()));
+                    }
+                    else {
+                        result.add("material:" + choice.getItemStack().getType().name());
+                    }
                 }
             };
             if (recipe instanceof ShapedRecipe) {