Follow up to b30c74a7733848f03e5defc238dca0e0cb044470
- Fixed Bug #7305
- Will enable it once the new starting point pre-re/re is done.

Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Merged/Updated/Added scripts from rAthena.
- Fixed Bug #7400

Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>
Merge branch 'master' of https://github.com/HerculesWS/Hercules