]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
PutClientInServer: fix regression
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 26 Oct 2015 06:09:17 +0000 (17:09 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 26 Oct 2015 06:09:46 +0000 (17:09 +1100)
qcsrc/server/cl_client.qc

index 4bf002d10a74c670466eaedcbd0060cadbefbf55..eb3dfc44e1aa12fad5259746286f08858719735e 100644 (file)
@@ -414,6 +414,9 @@ void PutClientInServer()
                WriteByte(MSG_ONE, SVC_SETVIEW);
                WriteEntity(MSG_ONE, this);
        }
+       if (gameover) {
+               this.classname = STR_OBSERVER;
+       }
 
        SetSpectatee(this, NULL);
 
@@ -422,14 +425,9 @@ void PutClientInServer()
 
        MUTATOR_CALLHOOK(PutClientInServer, this);
 
-       if (gameover) {
-               this.classname = STR_OBSERVER;
+       if (IS_OBSERVER(this)) {
                PutObserverInServer();
-               return;
-       }
-
-       if (IS_PLAYER(this))
-       {
+       } else if (IS_PLAYER(this)) {
                accuracy_resend(this);
 
                if (this.team < 0)