Merge pull request #724 from squeek502/1.7.10-merge-1.6.4

Merge some unmerged pull requests from 1.6.4 branch
This commit is contained in:
mDiyo committed 2014-07-12 10:01:35 -08:00
commit 1affd6d909
6 files changed
+86 -38

No files matched your search

@@ -320,9 +320,10 @@ public class SearedBlock extends InventoryBlock
}
else
{
FaucetLogic logic = (FaucetLogic) world.getTileEntity(x, y, z);
if (logic != null)
TileEntity tile = world.getTileEntity(x, y, z);
if (tile != null && tile instanceof FaucetLogic)
{
FaucetLogic logic = (FaucetLogic) tile;
float xMin = 0.25F;
float xMax = 0.75F;
float zMin = 0.25F;