Fixed Bug 7799 - SC_MOONSTAR neverending

Follows up 665f1306a130d4b8c359972bf4e58ef9d3bd9cd8
http://hercules.ws/board/tracker/issue-7799-sc-moonstar/

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

Special Thanks to kyeme for all the debug information and help!
http://hercules.ws/board/tracker/issue-7840-char-server-crash/

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