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

Fixed bad cast, fixed tubes and pipes losing capacity after world load

Browse source
This commit is contained in:
aidancbrady 2015-05-22 13:06:46 -04:00
parent 0b04665055
commit fa71836e0d
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/mekanism/api/gas/GasNetwork.java
View file

@ -295,12 +295,14 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
for(Coord4D coord : possibleAcceptors.keySet())
{
EnumSet<ForgeDirection> sides = acceptorDirections.get(coord);
IGasHandler acceptor = (IGasHandler)coord.getTileEntity(getWorld());
TileEntity tile = coord.getTileEntity(getWorld());
if(sides == null || sides.isEmpty())
if(!(tile instanceof IGasHandler) || sides == null || sides.isEmpty())
{
continue;
}
IGasHandler acceptor = (IGasHandler)tile;
for(ForgeDirection side : sides)
{

5
src/main/java/mekanism/common/FluidNetwork.java
View file

@ -295,13 +295,14 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
for(Coord4D coord : possibleAcceptors.keySet())
{
EnumSet<ForgeDirection> sides = acceptorDirections.get(coord);
TileEntity tile = coord.getTileEntity(getWorld());
if(sides == null || sides.isEmpty())
{
continue;
}
IFluidHandler acceptor = (IFluidHandler)coord.getTileEntity(getWorld());
IFluidHandler acceptor = (IFluidHandler)tile;
for(ForgeDirection side : sides)
{

5
src/main/java/mekanism/common/multipart/PartMechanicalPipe.java
View file

@ -126,13 +126,14 @@ public class PartMechanicalPipe extends PartTransmitter<IFluidHandler, FluidNetw
public void load(NBTTagCompound nbtTags)
{
super.load(nbtTags);
tier = Tier.PipeTier.values()[nbtTags.getInteger("tier")];
buffer.setCapacity(getCapacity());
if(nbtTags.hasKey("cacheFluid"))
{
buffer.setFluid(FluidStack.loadFluidStackFromNBT(nbtTags.getCompoundTag("cacheFluid")));
}
tier = Tier.PipeTier.values()[nbtTags.getInteger("tier")];
}
@Override

4
src/main/java/mekanism/common/multipart/PartPressurizedTube.java
View file

@ -134,6 +134,7 @@ public class PartPressurizedTube extends PartTransmitter<IGasHandler, GasNetwork
super.load(nbtTags);
tier = TubeTier.values()[nbtTags.getInteger("tier")];
buffer.setMaxGas(getCapacity());
if(nbtTags.hasKey("cacheGas"))
{
@ -303,8 +304,7 @@ public class PartPressurizedTube extends PartTransmitter<IGasHandler, GasNetwork
{
return super.getCachedAcceptor(side);
}
return null;
}
}