]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Execute TRANSMUTE(Observer, this); slightly earlier in PutObserverInServer (no functi...
authorterencehill <piuntn@gmail.com>
Thu, 3 Mar 2022 14:01:15 +0000 (15:01 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 3 Mar 2022 14:01:15 +0000 (15:01 +0100)
qcsrc/server/client.qc

index 8950854305c472ed3463d974bf28a8890da70cb6..aeb392c606483d8ee6da5e4ce02265ca4c0225a9 100644 (file)
@@ -303,13 +303,16 @@ void PutObserverInServer(entity this, bool is_forced, bool use_spawnpoint)
 
        if (this.vehicle) vehicles_exit(this.vehicle, VHEF_RELEASE);
 
+       TRANSMUTE(Observer, this);
+
+       if(recount_ready) ReadyCount();
+
        WaypointSprite_PlayerDead(this);
+       accuracy_resend(this);
 
        if (CS(this).killcount != FRAGS_SPECTATOR && !game_stopped && CHAT_NOSPECTATORS())
                Send_Notification(NOTIF_ONE_ONLY, this, MSG_INFO, INFO_CHAT_NOSPECTATORS);
 
-       accuracy_resend(this);
-
        CS(this).spectatortime = time;
        if(this.bot_attack)
                IL_REMOVE(g_bot_targets, this);
@@ -318,8 +321,6 @@ void PutObserverInServer(entity this, bool is_forced, bool use_spawnpoint)
                IL_REMOVE(g_monster_targets, this);
        this.monster_attack = false;
        STAT(HUD, this) = HUD_NORMAL;
-       TRANSMUTE(Observer, this);
-       if(recount_ready) ReadyCount();
        this.iscreature = false;
        this.teleportable = TELEPORT_SIMPLE;
        if(this.damagedbycontents)