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

Merge branch 'master' into development

Browse source 
Conflicts:
	src/main/java/mekanism/api/transmitters/DynamicNetwork.java
This commit is contained in:
Aidan C. Brady 2015-02-25 09:16:54 -05:00
parent 701cdfd7bd bf42f71b8e
commit f5dadf443a
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/mekanism/api/transmitters/DynamicNetwork.java
View file

@ -64,7 +64,9 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
return;
}
if(acceptor.getTileEntity(getWorld()) == null || acceptor.getTileEntity(getWorld()).isInvalid() || transmitter.canConnectToAcceptor(side, true))
World world = getWorld();
if(acceptor.getTileEntity(world) == null || acceptor.getTileEntity(world).isInvalid() || transmitter.canConnectToAcceptor(side, true))
{
acceptorDirections.get(acceptor).remove(side.getOpposite());

5
src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
View file

@ -470,6 +470,11 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
stacks:
for(ItemStack stack : stacks)
{
if(stack == null)
{
continue;
}
for(int i = 0; i < 27; i++)
{
if(testInv[i] == null)