Merge branch 'master' into terencehill/lms_itemtimes_fix

Conflicts:
	qcsrc/server/mutators/mutator/gamemode_lms.qc

diff --cc qcsrc/common/mutators/mutator/itemstime.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_lms.qc
index 442f539fa70d0a01819d99cb6e484d357c271a47,9c9e191d2065d59423dd4edadb6a10d1d266417a..9d82004e2758426d40c36a0215c766dc16f5bc48
--- 1/qcsrc/server/mutators/mutator/gamemode_lms.qc
--- 2/qcsrc/server/mutators/mutator/gamemode_lms.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_lms.qc
@@@ -160,14 -157,10 +157,9 @@@ MUTATOR_HOOKFUNCTION(lms, reset_map_glo
  }
  
  MUTATOR_HOOKFUNCTION(lms, reset_map_players)
 -{SELFPARAM();
 +{
-       entity e;
        if(restart_mapalreadyrestarted || (time < game_starttime))
-               FOR_EACH_PLAYER(e)
-               {
-                       PlayerScore_Add(e, SP_LMS_LIVES, LMS_NewPlayerLives());
-               }
 -      FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(WITH(entity, self, it, PlayerScore_Add(it, SP_LMS_LIVES, LMS_NewPlayerLives()))));
--
++      FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(PlayerScore_Add(it, SP_LMS_LIVES, LMS_NewPlayerLives())));
        return false;
  }