Corrected error handling in the server
More work on the new weapon system
Fixed weapon display on the client