Fix attack in pre-re (bug:8353)
Merge branch 'master' of https://github.com/HerculesWS/Hercules