Merge branch 'nyov/samual/combined_updates' into nyov/combined_updates/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 e0016b25018f67b523adb617ccf6d7296fc6a4ad..fdb53ace94e1f5b3b11d5aaeb0c621ab03ae776d 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -326,9 +326,7 @@ void reset_map(float dorespawn)
        if(time <= game_starttime && round_handler_IsActive())
                round_handler_Reset(game_starttime);
 
-       if(g_race || g_cts)
-               race_ReadyRestart();
-       else MUTATOR_CALLHOOK(reset_map_global);
+       MUTATOR_CALLHOOK(reset_map_global);
 
        for(self = world; (self = nextent(self)); )
        if(IS_NOT_A_CLIENT(self))
@@ -1013,7 +1011,7 @@ void VoteCommand_yes(float request, entity caller) // CLIENT ONLY
                case CMD_REQUEST_COMMAND:
                {
                        if (!vote_called) { print_to(caller, "^1No vote called."); }
-                       else if(caller.vote_selection != VOTE_SELECT_NULL && autocvar_sv_vote_change) { print_to(caller, "^1You have already voted."); }
+                       else if(caller.vote_selection != VOTE_SELECT_NULL && !autocvar_sv_vote_change) { print_to(caller, "^1You have already voted."); }
 
                        else // everything went okay, continue changing vote
                        {