From: <jde...@us...> - 2013-11-18 11:28:50
|
Revision: 22280 http://sourceforge.net/p/pcgen/code/22280 Author: jdempsey Date: 2013-11-18 11:28:46 +0000 (Mon, 18 Nov 2013) Log Message: ----------- Fix bug: Natural Attacks do not get equipped Issue#: CODE-2350 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 2013-11-18 10:33:26 UTC (rev 22279) +++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2013-11-18 11:28:46 UTC (rev 22280) @@ -8298,7 +8298,7 @@ // if it's a weapon we have to do some // checks for hands already in use - if (eqI.isWeapon()) + if (eqI.isWeapon() && !eqI.isNatural()) { // weapons can never occupy the same slot if (es.getName().equals(locName)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |