From: Mario <mario.mario@y7mail.com>
Date: Wed, 17 Apr 2013 07:45:28 +0000 (+1000)
Subject: Fix spider freezing dead players/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~371
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dd7ed587c4889d836e7df3fb6ba2848a2a2268dc;p=xonotic%2Fxonotic-data.pk3dir.git

Fix spider freezing dead players/monsters
---

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index f6a0e119a..b20b22477 100644
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -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
 	}
 	
diff --git a/qcsrc/server/monsters/monster/spider.qc b/qcsrc/server/monsters/monster/spider.qc
index b21b153d0..3fafa1851 100644
--- a/qcsrc/server/monsters/monster/spider.qc
+++ b/qcsrc/server/monsters/monster/spider.qc
@@ -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: