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

Merge branch 'master' into development

Browse source 
* master:
  Fixed Induction Matrix issue
This commit is contained in:
aidancbrady 2016-02-28 12:31:34 -05:00
commit 3d43a96f91
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java
View file

@ -73,7 +73,7 @@ public class MatrixUpdateProtocol extends UpdateProtocol<SynchronizedMatrixData>
}
@Override
protected void onFormed()
public boolean isInteriorValid(SynchronizedMatrixData structure)
{
for(Coord4D coord : innerNodes)
{
@ -81,14 +81,16 @@ public class MatrixUpdateProtocol extends UpdateProtocol<SynchronizedMatrixData>
if(tile instanceof TileEntityInductionCell)
{
structureFound.cells.add(coord);
structureFound.storageCap += ((TileEntityInductionCell)tile).tier.maxEnergy;
structure.cells.add(coord);
structure.storageCap += ((TileEntityInductionCell)tile).tier.maxEnergy;
}
else if(tile instanceof TileEntityInductionProvider)
{
structureFound.providers.add(coord);
structureFound.transferCap += ((TileEntityInductionProvider)tile).tier.output;
structure.providers.add(coord);
structure.transferCap += ((TileEntityInductionProvider)tile).tier.output;
}
}
return true;
}
}