Merge remote-tracking branch 'origin/terencehill/forced_intermission_eventchase'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_jumppads.qc

diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc
index bf17e3faf0ece436d0508dc64c4a9bc517103566..8923c19f18300e1f742acd0586e61539744c3c15 100644 (file)
--- a/qcsrc/server/t_jumppads.qc
+++ b/qcsrc/server/t_jumppads.qc
@@ -2,6 +2,7 @@ float PUSH_ONCE                 = 1;
 float PUSH_SILENT              = 2;
 
 .float pushltime;
+.float istypefrag;
 .float height;
 
 void() SUB_UseTargets;
@@ -200,6 +201,7 @@ void trigger_push_touch()
                                other.lastteleporttime = time;
 
                        if (!other.animstate_override)
+                       if (other.deadflag == DEAD_NO)
                        {
                                if (other.crouch)
                                        setanim(other, other.anim_duckjump, FALSE, TRUE, TRUE);
@@ -212,6 +214,7 @@ void trigger_push_touch()
 
                // reset tracking of who pushed you into a hazard (for kill credit)
                other.pushltime = 0;
+               other.istypefrag = 0;
        }
 
        if(self.enemy.target)
@@ -285,7 +288,7 @@ void trigger_push_findtarget()
                else if(n == 1)
                {
                        // exactly one dest - bots love that
-                       self.enemy = find(e, targetname, self.target);
+                       self.enemy = find(world, targetname, self.target);
                }
                else
                {