Merge branch 'master' into mirceakitsune/damage_effects

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

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index f3e846110f19c297b0ed0bb9faa5f5e2ccf0ace5..8769629f96613bf13247f954617b6535e536f55d 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -696,7 +696,7 @@ void VoteCommand_master(float request, entity caller, float argc, string vote_co
                                                
                                                if not(caller.vote_master) { print_to(caller, "^1You do not have vote master privelages."); }
                                                else if not(VoteCommand_checknasty(vote_command)) { print_to(caller, "^1Syntax error in command, see 'vhelp' for more info."); }
-                                               else if not(VoteCommand_parse(caller, vote_command, autocvar_sv_vote_master_commands, 3, argc)) { print_to(caller, "^1This command is not acceptable, see 'vhelp' for more info."); }
+                                               else if not(VoteCommand_parse(caller, vote_command, strcat(autocvar_sv_vote_commands, " ", autocvar_sv_vote_master_commands), 3, argc)) { print_to(caller, "^1This command is not acceptable, see 'vhelp' for more info."); }
                                                
                                                else // everything went okay, proceed with command
                                                {