Added a quick fix
Merge branch 'master' of https://github.com/Xackery/Server

Conflicts:
	zone/client_packet.cpp