Merge branch 'master' into development
Conflicts: src/main/java/mekanism/api/transmitters/DynamicNetwork.java
This commit is contained in:
commit
f5dadf443a
2 changed files with 8 additions and 1 deletions
|
@ -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());
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue