From: <jde...@us...> - 2007-03-21 21:15:05
|
Revision: 2554 http://svn.sourceforge.net/pcgen/?rev=2554&view=rev Author: jdempsey Date: 2007-03-21 14:15:02 -0700 (Wed, 21 Mar 2007) Log Message: ----------- Correct NPE in getUsedFeatCount Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2007-03-21 21:03:49 UTC (rev 2553) +++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2007-03-21 21:15:02 UTC (rev 2554) @@ -16334,8 +16334,13 @@ { double iCount = 0; - for (Ability aFeat : realAbilities.get(AbilityCategory.FEAT)) + List<Ability> abilities = realAbilities.get(AbilityCategory.FEAT); + if (abilities == null) { + return 0; + } + for (Ability aFeat : abilities) + { // // Don't increment the count for // hidden feats so the number This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |