Merge branch 'Mario/itemstime_editor_fix' into 'master'

[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 e6cd4c154b6e13286be160c1f13ed13ab5836101..b6f38ed32b4632074828079c82b8cf07407058b4 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -109,7 +109,7 @@ void Nagger_ReadyCounted()
 // If the vote_caller is still here, return their name, otherwise vote_caller_name
 string OriginalCallerName()
 {
-       if (IS_REAL_CLIENT(vote_caller)) return vote_caller.netname;
+       if (IS_REAL_CLIENT(vote_caller)) return playername(vote_caller, false);
        return vote_caller_name;
 }
 
@@ -367,8 +367,8 @@ void reset_map(bool dorespawn)
        {
                if (!MUTATOR_CALLHOOK(reset_map_players))
                {
-                       //if (restart_mapalreadyrestarted || (time < game_starttime))
-                       //{
+                       if (restart_mapalreadyrestarted || (time < game_starttime))
+                       {
                                FOREACH_CLIENT(IS_PLAYER(it),
                                {
                                        /*
@@ -386,7 +386,7 @@ void reset_map(bool dorespawn)
                                        it.movement = '0 0 0';
                                        PutClientInServer(it);
                                });
-                       //}
+                       }
                }
        }
 }
@@ -419,7 +419,7 @@ void ReadyRestart_force()
        game_starttime = time + RESTART_COUNTDOWN;
 
        // clear player attributes
-       FOREACH_CLIENT(true, LAMBDA(
+       FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
                it.alivetime = 0;
                it.killcount = 0;
                PS_GR_P_ADDVAL(it, PLAYERSTATS_ALIVETIME, -PS_GR_P_ADDVAL(it, PLAYERSTATS_ALIVETIME, 0));