From: Mario <mario@smbclan.net>
Date: Wed, 25 Jan 2017 07:20:34 +0000 (+1000)
Subject: Actually fix it (we apparently still need owner for the trace)
X-Git-Tag: xonotic-v0.8.2~273
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ba78d7ca6e4c5335515fa66b3572661b90a2449d;p=xonotic%2Fxonotic-data.pk3dir.git

Actually fix it (we apparently still need owner for the trace)
---

diff --git a/qcsrc/common/vehicles/vehicle/raptor.qc b/qcsrc/common/vehicles/vehicle/raptor.qc
index 7bbc39e89..b05dd9812 100644
--- 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));
 }
 
diff --git a/qcsrc/common/vehicles/vehicle/spiderbot.qc b/qcsrc/common/vehicles/vehicle/spiderbot.qc
index 7634e7680..a5411e843 100644
--- a/qcsrc/common/vehicles/vehicle/spiderbot.qc
+++ b/qcsrc/common/vehicles/vehicle/spiderbot.qc
@@ -319,7 +319,6 @@ bool spiderbot_frame(entity this, float dt)
 void spiderbot_exit(entity this, int eject)
 {
 	entity player = this.owner;
-	this.owner = NULL;
 
 	IL_EACH(g_projectiles, it.owner == player && it.classname == "spiderbot_rocket",
 	{
@@ -333,7 +332,10 @@ void spiderbot_exit(entity this, int eject)
 	set_movetype(this, MOVETYPE_WALK);
 
 	if(!player)
+	{
+		this.owner = NULL; // reset owner anyway?
 		return;
+	}
 
 	makevectors(this.angles);
 	vector spot;
@@ -366,6 +368,7 @@ void spiderbot_exit(entity this, int eject)
 	}
 
 	antilag_clear(player, CS(player));
+	this.owner = NULL;
 }
 
 void spiderbot_headfade(entity this)