From: <jde...@us...> - 2010-10-02 23:46:31
|
Revision: 13271 http://pcgen.svn.sourceforge.net/pcgen/?rev=13271&view=rev Author: jdempsey Date: 2010-10-02 23:46:25 +0000 (Sat, 02 Oct 2010) Log Message: ----------- Fix bug: Familiar has too many skills Issue#: CODE-234 Modified Paths: -------------- branches/5.16.x/pcgen/code/src/java/pcgen/core/PlayerCharacter.java Modified: branches/5.16.x/pcgen/code/src/java/pcgen/core/PlayerCharacter.java =================================================================== --- branches/5.16.x/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2010-10-02 22:58:08 UTC (rev 13270) +++ branches/5.16.x/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2010-10-02 23:46:25 UTC (rev 13271) @@ -1004,6 +1004,10 @@ */ public PCClass getClassKeyed(final String aString) { + if (aString == null || aString.equals("None")) + { + return null; + } for (PCClass aClass : classList) { if (aClass.getKeyName().equalsIgnoreCase(aString) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |