Prevent client only commands from bleeding through to the server.
Merge pull request #1219 from Lunatrius/master

Prevent client only commands from bleeding through to the server.