Merge branch 'master' into martin-t/damagetext

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / vehicles / vehicle / raptor.qc

diff --git a/qcsrc/common/vehicles/vehicle/raptor.qc b/qcsrc/common/vehicles/vehicle/raptor.qc
index 7bbc39e89740146fd953dd40b38a976ad351142a..b05dd9812e4443e6332e5d81d9364b9f3b6246f9 100644 (file)
--- a/qcsrc/common/vehicles/vehicle/raptor.qc
+++ b/qcsrc/common/vehicles/vehicle/raptor.qc
@@ -84,7 +84,6 @@ void raptor_land(entity this)
 void raptor_exit(entity this, int eject)
 {
        entity player = this.owner;
-       this.owner = NULL;
 
        this.tur_head.exteriormodeltoclient = NULL;
 
@@ -127,6 +126,7 @@ void raptor_exit(entity this, int eject)
                setorigin(player, spot);
        }
 
+       this.owner = NULL;
        antilag_clear(player, CS(player));
 }