From 2bee5f7ac6a42f81612e25e132bd0cdd7ed9ca12 Mon Sep 17 00:00:00 2001 From: alexbegt Date: Sat, 19 Jan 2019 15:40:07 -0500 Subject: [PATCH] Fix recipe constants being overridden by a blank map. Closes #5380 --- .../net/minecraftforge/common/crafting/CraftingHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java b/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java index 69038d0ad0..31d42208fc 100644 --- a/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java +++ b/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java @@ -325,12 +325,12 @@ public class CraftingHelper } } if (!items.isEmpty()) - constants.put(new ResourceLocation(JsonUtils.getString(json, "name")), new StackList(items)); + ret.put(new ResourceLocation(JsonUtils.getString(json, "name")), new StackList(items)); } else if (json.has("tag")) - constants.put(new ResourceLocation(JsonUtils.getString(json, "name")), Ingredient.deserializeItemList(json)); + ret.put(new ResourceLocation(JsonUtils.getString(json, "name")), Ingredient.deserializeItemList(json)); else if (json.has("item")) - constants.put(new ResourceLocation(JsonUtils.getString(json, "name")), new StackList(Lists.newArrayList(getItemStack(JsonUtils.getJsonObject(json, "item"), true)))); + ret.put(new ResourceLocation(JsonUtils.getString(json, "name")), new StackList(Lists.newArrayList(getItemStack(JsonUtils.getJsonObject(json, "item"), true)))); else LOGGER.error(CRAFTHELPER, "Couldn't load constant #{} from {} as it's missing `item` or `items` element", x, key); }