Core/WorldPacket: Fix the core spamming complaints about CMSG_QUEST_QUERY being sent post-logout

Core/Spells: A little bit of "cleanup"

--HG--
branch : trunk
This commit is contained in:
silinoron
2010-09-03 20:30:29 -07:00
parent d2c259fe76
commit 1e1c596dda
3 changed files with 13 additions and 8 deletions
+9 -7
View File
@@ -3225,6 +3225,7 @@ void Spell::cast(bool skipCheck)
else if (m_spellInfo->excludeTargetAuraSpell && !IsPositiveSpell(m_spellInfo->excludeTargetAuraSpell))
m_preCastSpell = m_spellInfo->excludeTargetAuraSpell;
}
switch (m_spellInfo->SpellFamilyName)
{
case SPELLFAMILY_GENERIC:
@@ -3233,14 +3234,15 @@ void Spell::cast(bool skipCheck)
m_preCastSpell = 11196; // Recently Bandaged
break;
}
case SPELLFAMILY_MAGE:
{
// Permafrost
if (m_spellInfo->SpellFamilyFlags[1] & 0x00001000 || m_spellInfo->SpellFamilyFlags[0] & 0x00100220)
m_preCastSpell = 68391;
break;
}
case SPELLFAMILY_MAGE:
{
// Permafrost
if (m_spellInfo->SpellFamilyFlags[1] & 0x00001000 || m_spellInfo->SpellFamilyFlags[0] & 0x00100220)
m_preCastSpell = 68391;
break;
}
}
// traded items have trade slot instead of guid in m_itemTargetGUID
// set to real guid to be sent later to the client
m_targets.updateTradeSlotItem();