keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge pull request #2174 from diesieben07/findBlockFix 

Fix GameData.findBlock
This commit is contained in:
cpw 2015-11-08 10:30:18 -05:00
parent b6664c76c5 e6d8fde415
commit 95b30f5153
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minecraftforge/fml/common/registry/GameData.java
View File

@ -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)