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

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

diff --git a/qcsrc/common/vehicles/vehicle/spiderbot.qc b/qcsrc/common/vehicles/vehicle/spiderbot.qc
index 7634e7680fc59022282c1471c9dbfe015074457f..a5411e843474927583544807a07ef7ce58dd151b 100644 (file)
--- 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)