tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development

Browse source
This commit is contained in:
Aidan C. Brady 2014-01-08 22:26:08 -05:00
commit 8886b4caaa
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/mekanism/client/ClientProxy.java
View file

@ -304,6 +304,11 @@ public class ClientProxy extends CommonProxy
{ {
TileEntity tileEntity = world.getBlockTileEntity(x, y, z); TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
if(tileEntity == null)
{
return null;
}
switch(ID) switch(ID)
{ {
case 0: case 0:

5
common/mekanism/common/CommonProxy.java
View file

@ -267,6 +267,11 @@ public class CommonProxy
{ {
TileEntity tileEntity = world.getBlockTileEntity(x, y, z); TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
if(tileEntity == null)
{
return null;
}
switch(ID) switch(ID)
{ {
case 0: case 0: