Fixed Bug #7520

Added code to ensure 1st/2nd tabs are meeting the conditions; Special Thanks to Haruna, ToiletMaster
http://hercules.ws/board/tracker/issue-7520-skill-point-error/
Also - Follow up 9bcb1423969870a6b60819e6f3846fe0235e28a9
extending it to cached item packages.

Signed-off-by: shennetsind <ind@henn.et>
Merge branch 'master' of https://github.com/HerculesWS/Hercules