From: terencehill Date: Sun, 4 Sep 2016 17:38:46 +0000 (+0200) Subject: Remove redundant code from Join (it gets executed in PutClientInServer) X-Git-Tag: xonotic-v0.8.2~620^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7e342503064d91f6506ed6d00703f3ad24d2b9fd;p=xonotic%2Fxonotic-data.pk3dir.git Remove redundant code from Join (it gets executed in PutClientInServer) --- diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index 71c2b2265..0676c71fe 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -1878,8 +1878,6 @@ void Join(entity this) { TRANSMUTE(Player, this); - SetSpectatee(this, NULL); - if(!this.team_selected) if(autocvar_g_campaign || autocvar_g_balance_teams) JoinBestTeam(this, false, true); @@ -1890,8 +1888,6 @@ void Join(entity this) Kill_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CPID_PREVENT_JOIN); PutClientInServer(this); - if(!this.team_selected) - PlayerScore_Clear(this); Send_Notification(NOTIF_ALL, NULL, MSG_INFO, ((teamplay && this.team != -1) ? APP_TEAM_ENT(this, INFO_JOIN_PLAY_TEAM) : INFO_JOIN_PLAY), this.netname); this.team_selected = false;