From e6d8fde4150ce5f64a04d760ea68184f05a22e28 Mon Sep 17 00:00:00 2001 From: Take Weiland Date: Sun, 8 Nov 2015 15:34:31 +0100 Subject: [PATCH] Fix GameData.findBlock --- .../net/minecraftforge/fml/common/registry/GameData.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/common/registry/GameData.java b/src/main/java/net/minecraftforge/fml/common/registry/GameData.java index 1f07aebc33..9745f12575 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/GameData.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/GameData.java @@ -155,13 +155,12 @@ public class GameData { static Item findItem(String modId, String name) { - return (Item)getMain().iItemRegistry.getObject(modId + ":" + name); + return getMain().iItemRegistry.getObject(modId + ":" + name); } static Block findBlock(String modId, String name) { - String key = modId + ":" + name; - return getMain().iBlockRegistry.containsKey(key) ? getMain().iBlockRegistry.getObject(key) : null; + return getMain().iBlockRegistry.getObject(modId + ":" + name); } static UniqueIdentifier getUniqueName(Block block)