Merge remote branch 'origin/master' into samual/updatecommands

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / clientcommands.qc

diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc
index de37d377d38eb95a38810ec1483a5c8c4279c76a..f51871cf78b7dfc1075410b7d625ae8b0da8d2ea 100644 (file)
--- a/qcsrc/server/clientcommands.qc
+++ b/qcsrc/server/clientcommands.qc
@@ -1,6 +1,6 @@
 // =======================================================
 //  Server side client commands code, reworked by Samual
-//  Last updated: August 4th, 2011
+//  Last updated: November 4th, 2011
 // =======================================================
 
 #define CC_REQUEST_HELP 1
@@ -1123,7 +1123,11 @@ void SV_ParseClientCommand(string command)
                else
                        search_request_type = CC_REQUEST_USAGE; // Instead of trying to call a command, we're going to see detailed information about it
        } 
-       else*/ if(GameCommand_Vote(command, self)) 
+       else*/ if(MUTATOR_CALLHOOK(SV_ParseClientCommand))
+       {
+               return; // handled by a mutator
+       }
+       else if(GameCommand_Vote(command, self)) 
        {
                return; // handled by server/vote.qc 
        }