From: Lyberta Date: Mon, 3 Sep 2018 19:37:17 +0000 (+0300) Subject: Fix copy-paste error. X-Git-Tag: xonotic-v0.8.5~1899^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2cabbcd1e3acb48f45f56f976a94b7c8d48addee;p=xonotic%2Fxonotic-data.pk3dir.git Fix copy-paste error. --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a035335d5..9423d5d5d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ test_sv_game: - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache - make - - EXPECT=f2d3077e76dd3519ed8f2ad80a337b5a + - EXPECT=dc1bc3ac45188576a9651c6b7a1535a8 - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg | tee /dev/stderr | grep '^:' diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc index e52538de4..abc5df1d7 100644 --- a/qcsrc/server/teamplay.qc +++ b/qcsrc/server/teamplay.qc @@ -222,14 +222,14 @@ bool SetPlayerTeam(entity player, int team_index, int type) } else { - if (!CS(this).just_joined) + if (!CS(player).just_joined) { Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_QUIT_SPECTATE, player.netname); } else { - CS(this).just_joined = false; + CS(player).just_joined = false; } } KillPlayerForTeamChange(player);