]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix spider freezing dead players/monsters
authorMario <mario.mario@y7mail.com>
Wed, 17 Apr 2013 07:45:28 +0000 (17:45 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 17 Apr 2013 07:45:28 +0000 (17:45 +1000)
qcsrc/server/monsters/lib/monsters.qc
qcsrc/server/monsters/monster/spider.qc

index f6a0e119af35f9395de8e06eb75a30237845289a..b20b22477cef0f9800a2990a94a81bd60a53b66b 100644 (file)
@@ -493,6 +493,8 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
                if(self.revive_progress >= 1)
                        Unfreeze(self); // wait for next think before attacking
                        
+               self.SendFlags |= MSF_MOVE;
+                       
                return; // no moving while frozen
        }
        
index b21b153d06c793f2c01394417f4e9de9f67c1bae..3fafa185132935a086cc47a59f7bfe1552ae2fc1 100644 (file)
@@ -72,6 +72,7 @@ void spider_web_touch ()
        PROJECTILE_TOUCH;
        
        if(other.takedamage == DAMAGE_AIM)
+       if(other.health > 0)
        switch(self.realowner.spider_type)
        {
                case SPIDER_TYPE_ICE: