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

findBlock should now return null, not the default block, if the thing being looked for is not found. Closes #352

Browse source
This commit is contained in:
Christian 2014-01-20 07:49:44 -05:00
parent 48ff8b895a
commit 8121f3fcae
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fml/src/main/java/cpw/mods/fml/common/registry/GameData.java
View file

@ -63,7 +63,8 @@ public class GameData {
static Block findBlock(String modId, String name) static Block findBlock(String modId, String name)
{ {
return (Block) blockRegistry.func_82594_a(modId + ":" + name); String key = modId + ":" + name;
return blockRegistry.contains(key) ? blockRegistry.func_82594_a(key) : null;
} }
static ItemStack findItemStack(String modId, String name) static ItemStack findItemStack(String modId, String name)