Merge branch 'master' into 303

This commit is contained in:
tomrus88 2008-11-09 11:37:52 +03:00
commit 50e538c32f
11 changed files with 284 additions and 81 deletions

View file

@ -2601,7 +2601,8 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real)
}
else
{
m_target->SetDisplayId(m_target->GetNativeDisplayId());
if(modelid > 0)
m_target->SetDisplayId(m_target->GetNativeDisplayId());
m_target->SetByteValue(UNIT_FIELD_BYTES_2, 3, FORM_NONE);
if(m_target->getClass() == CLASS_DRUID)
m_target->setPowerType(POWER_MANA);