Fixed JPCondition Parser and warlock soulstone....combat rez still won't work ;)
Merge pull request #357 from kirk24788/master

Fixed JPCondition Parser and warlock soulstone....combat rez still won't work ;)