upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 16:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix recipe constants being overridden by a blank map. Closes #5380

Browse Source
This commit is contained in:
alexbegt authored and cpw committed 2019-01-20 16:03:09 +00:00
1 parent 60524f0f3e
commit 2bee5f7ac6
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java
+3 -3
View File
@@ -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);
}