Merge branch 'master' into pending-release

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / gamemodes / gamemode / lms / sv_lms.qc

diff --git a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
index 947111a08f66e80c566c4c5cc92ad0dd9d409bb4..51df1bb2ae7a1aad68432909a87da9bd4a002044 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
+++ b/qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc
@@ -112,7 +112,7 @@ int WinningCondition_LMS()
                        else
                        {
                                // a winner!
-                               // and assign him his first place
+                               // and assign them their first place
                                GameRules_scoring_add(first_player, LMS_RANK, 1);
                                first_player.winning = 1;
                                return WINNING_YES;
@@ -674,10 +674,9 @@ MUTATOR_HOOKFUNCTION(lms, OnEntityPreSpawn)
        entity e = spawn();
        setthink(e, lms_extralife);
 
+       Item_CopyFields(ent, e);
+
        e.nextthink = time + 0.1;
-       e.spawnflags = ent.spawnflags;
-       e.noalign = ent.noalign;
-       setorigin(e, ent.origin);
 
        return true;
 }