Merge branch 'master' into terencehill/min_spec_time
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / client.qc
index df2c785668f75c54c08bcab9366fcee0c2c3a102..3fd9113bdd18e73adc32d4e7bfdbfc42235af2fe 100644 (file)
@@ -1219,16 +1219,7 @@ void ClientConnect(entity this)
        JoinBestTeam(this, false); // if the team number is valid, keep it
        this.playerid = playerid_save;
 
-       if (autocvar_sv_spectate || autocvar_g_campaign || this.team_forced < 0) {
-               TRANSMUTE(Observer, this);
-       } else {
-               if (!teamplay || autocvar_g_balance_teams) {
-                       TRANSMUTE(Player, this);
-                       campaign_bots_may_start = true;
-               } else {
-                       TRANSMUTE(Observer, this); // do it anyway
-               }
-       }
+       TRANSMUTE(Observer, this);
 
        PlayerStats_GameReport_AddEvent(sprintf("kills-%d", this.playerid));
 
@@ -2572,7 +2563,10 @@ void PlayerPreThink (entity this)
        if (IS_REAL_CLIENT(this))
                PrintWelcomeMessage(this);
 
+       #define MIN_SPEC_TIME 1
        if (IS_PLAYER(this)) {
+               if (IS_REAL_CLIENT(this) && time < CS(this).jointime + MIN_SPEC_TIME)
+                       error("Client can't be spawned as player on connection!");
                if(!PlayerThink(this))
                        return;
        }
@@ -2581,6 +2575,22 @@ void PlayerPreThink (entity this)
                        IntermissionThink(this);
                return;
        }
+       else if (IS_REAL_CLIENT(this) && time < CS(this).jointime + MIN_SPEC_TIME + 1)
+       {
+               // don't do this in ClientConnect
+               // many things can go wrong if a client is spawned as player on connection
+               if (time > CS(this).jointime + MIN_SPEC_TIME)
+               {
+                       if (MUTATOR_CALLHOOK(AutoJoinOnConnection, this)
+                               || (!(autocvar_sv_spectate || autocvar_g_campaign || this.team_forced < 0)
+                                       && (!teamplay || autocvar_g_balance_teams)))
+                       {
+                               campaign_bots_may_start = true;
+                               Join(this);
+                               return;
+                       }
+               }
+       }
        else if (IS_OBSERVER(this)) {
                ObserverThink(this);
        }