tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed a few tile network creation issues

Browse source
This commit is contained in:
DarkGuardsman 2013-11-25 11:03:31 -05:00
parent 127b145bf6
commit 15cfa7cf58
3 changed files with 36 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java
View file

@ -23,6 +23,11 @@ public class NetworkFluidContainers extends NetworkFluidTiles
NetworkUpdateHandler.registerNetworkClass("FluidContainers", NetworkFluidContainers.class);
}
public NetworkFluidContainers()
{
super();
}
public NetworkFluidContainers(INetworkPart... parts)
{
super(parts);

12
src/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java
View file

@ -34,6 +34,11 @@ public class NetworkFluidTiles extends NetworkTileEntities
NetworkUpdateHandler.registerNetworkClass("FluidTiles", NetworkFluidTiles.class);
}
public NetworkFluidTiles()
{
super();
}
public NetworkFluidTiles(INetworkPart... parts)
{
super(parts);
@ -223,6 +228,8 @@ public class NetworkFluidTiles extends NetworkTileEntities
protected void mergeDo(ITileNetwork network)
{
ITileNetwork newNetwork = NetworkUpdateHandler.createNewNetwork(NetworkUpdateHandler.getID(this.getClass()));
if (newNetwork != null)
{
if (newNetwork instanceof NetworkFluidTiles)
{
FluidStack one = this.getNetworkTank().getFluid();
@ -238,6 +245,11 @@ public class NetworkFluidTiles extends NetworkTileEntities
newNetwork.getMembers().addAll(network.getMembers());
newNetwork.onCreated();
}
else
{
System.out.println("[NetworkFluidTiles] Failed to merge network due to the new network returned null");
}
}
@Override
public void cleanUpMembers()

5
src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java
View file

@ -26,6 +26,11 @@ public class NetworkPipes extends NetworkFluidTiles
NetworkUpdateHandler.registerNetworkClass("FluidPipes", NetworkPipes.class);
}
public NetworkPipes()
{
super();
}
public NetworkPipes(INetworkPart... parts)
{
super(parts);