*Merge.

--HG-- branch : trunk
2009-04-22 17:52:01 -05:00
parent 1cd8ea8c1a dc326fdf2c
commit e7e03d167e
5 changed files with 21 additions and 4 deletions
@@ -5390,6 +5390,15 @@ void AuraEffect::HandleAuraModPacify(bool apply, bool Real)
        m_target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED);
    else
        m_target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED);
+		
+	
+ 	if(m_spellProto->Id == 45839){
+		if(apply){
+            m_target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+		}else{
+            m_target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+		}
+	}
 }

 void AuraEffect::HandleAuraModPacifyAndSilence(bool apply, bool Real)