tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Browse source
This commit is contained in:
AlgorithmX2 2014-05-25 11:07:18 -05:00
commit 7b33635c47
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integration/modules/Waila.java
View file

@ -96,7 +96,7 @@ public class Waila extends BaseModule implements IWailaDataProvider
if ( ThingOfInterest instanceof TileEnergyCell )
{
NBTTagCompound c = accessor.getNBTData();
if ( c != null )
if ( c != null && c.hasKey( "internalCurrentPower" ) )
{
TileEnergyCell tec = (TileEnergyCell) ThingOfInterest;
long power = (long) (100 * c.getDouble( "internalCurrentPower" ));

3
tile/networking/TileEnergyCell.java
View file

@ -56,7 +56,8 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage
@Override
public void writeToNBT(NBTTagCompound data)
{
data.setDouble( "internalCurrentPower", internalCurrentPower );
if ( !worldObj.isRemote )
data.setDouble( "internalCurrentPower", internalCurrentPower );
}
@Override