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

2014-05-25 11:07:18 -05:00
parent bd7b154455 4cf6f4e5f9
commit 7b33635c47
2 changed files with 3 additions and 2 deletions
@@ -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" ));