Move reset_map LMS score back into arena.qc to fix clients getting double lives

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index a2298c6fb719b38f5cdb7dc0509799b725d33f91..ef81fd92bad7db138edb2fa1e1067d252bae875b 100644 (file)
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -108,6 +108,8 @@ void reset_map(float dorespawn)
                                        //NEW: changed behaviour so that it prevents that previous spectators/observers suddenly spawn as players
                                        if (self.classname == "player") {
                                                //PlayerScore_Clear(self);
+                                               if(g_lms)
+                                                       PlayerScore_Add(self, SP_LMS_LIVES, LMS_NewPlayerLives());
                                                self.killcount = 0;
                                                //stop the player from moving so that he stands still once he gets respawned
                                                self.velocity = '0 0 0';

diff --git a/qcsrc/server/mutators/gamemode_lms.qc b/qcsrc/server/mutators/gamemode_lms.qc
index 8d336e60e39bf6a4fd48e509582d1731620bc77a..1e9db0e7dac7c11853a6dd1fee6e0bb086c35a25 100644 (file)
--- a/qcsrc/server/mutators/gamemode_lms.qc
+++ b/qcsrc/server/mutators/gamemode_lms.qc
@@ -31,8 +31,6 @@ MUTATOR_HOOKFUNCTION(lms_RemovePlayer)
 
 MUTATOR_HOOKFUNCTION(lms_PlayerSpawn)
 {
-       PlayerScore_Add(self, SP_LMS_LIVES, LMS_NewPlayerLives());
-       
        // player is dead and becomes observer
        // FIXME fix LMS scoring for new system
        if(PlayerScore_Add(self, SP_LMS_RANK, 0) > 0)