From: TimePath <andrew.hardaker1995@gmail.com>
Date: Fri, 21 Aug 2015 06:24:34 +0000 (+1000)
Subject: Merge branch 'TimePath/issues/1490'
X-Git-Tag: xonotic-v0.8.2~2063
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a97f97fea293089f2e7b6c26304d4355a649cde3;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/issues/1490'

# Conflicts:
#	qcsrc/common/monsters/monster/mage.qc
---

a97f97fea293089f2e7b6c26304d4355a649cde3
diff --cc qcsrc/common/monsters/monster/mage.qc
index 13d9d33e4,02f37c890..2418bfc0c
--- a/qcsrc/common/monsters/monster/mage.qc
+++ b/qcsrc/common/monsters/monster/mage.qc
@@@ -67,8 -67,8 +67,8 @@@ float friend_needshelp(entity e
  	if(e.frozen)
  		return false;
  	if(!IS_PLAYER(e))
 -		return ((e.flags & FL_MONSTER) && e.health < e.max_health);
 +		return (IS_MONSTER(e) && e.health < e.max_health);
- 	if(e.items & IT_INVINCIBLE)
+ 	if(e.items & ITEM_Shield.m_itemid)
  		return false;
  
  	switch(self.skin)