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

Removed now-useless checks

Browse source
This commit is contained in:
Aidan C. Brady 2013-12-17 18:27:44 -05:00
parent dc6128a88c
commit e7cc127bb2
2 changed files with 0 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
common/mekanism/common/FluidNetwork.java
View file

@ -231,23 +231,6 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
}
}
@Override
public boolean isValidMerger(TileEntity tileEntity)
{
ITransmitter<FluidNetwork> transmitter = (ITransmitter<FluidNetwork>)tileEntity;
if(fluidStored == null || transmitter.getTransmitterNetwork(false) == null || transmitter.getTransmitterNetwork().fluidStored == null)
{
return true;
}
else if(fluidStored.getFluid() == transmitter.getTransmitterNetwork().fluidStored.getFluid())
{
return true;
}
return false;
}
@Override
public void clientTick()
{

40
common/mekanism/common/multipart/PartMechanicalPipe.java
View file

@ -144,46 +144,6 @@ public class PartMechanicalPipe extends PartTransmitter<FluidNetwork> implements
nbtTags.setCompoundTag("cacheFluid", stack.writeToNBT(new NBTTagCompound()));
}
}
@Override
public boolean canConnect(ForgeDirection side)
{
if(!super.canConnect(side))
{
return false;
}
TileEntity tileEntity = Object3D.get(tile()).getFromSide(side).getTileEntity(world());
if(tileEntity instanceof ITransmitter && TransmissionType.checkTransmissionType(tileEntity, getTransmissionType()))
{
ITransmitter<FluidNetwork> transmitter = (ITransmitter<FluidNetwork>)tileEntity;
if(getTransmitterNetwork(false) == null || transmitter.getTransmitterNetwork(false) == null)
{
if(transmitter.getTransmitterNetwork(false) == null || transmitter.getTransmitterNetwork(false).fluidStored == null)
{
return true;
}
}
else if(getTransmitterNetwork().fluidStored == null || transmitter.getTransmitterNetwork().fluidStored == null)
{
return true;
}
if(getTransmitterNetwork(false) != null && transmitter.getTransmitterNetwork(false) != null)
{
if(getTransmitterNetwork().fluidStored.getFluid() == transmitter.getTransmitterNetwork().fluidStored.getFluid())
{
return true;
}
}
return false;
}
return true;
}
@Override
public String getType()