*Consider flight spells as passive spells.
--HG-- branch : trunk
This commit is contained in:
+1
-1
@@ -16909,7 +16909,7 @@ void Player::VehicleSpellInitialize()
|
|||||||
if(!spellInfo)
|
if(!spellInfo)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if(IsPassiveSpell(spellId) || spellInfo->activeIconID == 2158) //flight
|
if(IsPassiveSpell(spellId))
|
||||||
{
|
{
|
||||||
charm->CastSpell(charm, spellId, true);
|
charm->CastSpell(charm, spellId, true);
|
||||||
data << uint16(0) << uint8(0) << uint8(i+8);
|
data << uint16(0) << uint8(0) << uint8(i+8);
|
||||||
|
|||||||
@@ -303,7 +303,11 @@ bool IsPassiveSpell(uint32 spellId)
|
|||||||
SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
|
SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
|
||||||
if (!spellInfo)
|
if (!spellInfo)
|
||||||
return false;
|
return false;
|
||||||
return (spellInfo->Attributes & SPELL_ATTR_PASSIVE) != 0;
|
if(spellInfo->Attributes & SPELL_ATTR_PASSIVE)
|
||||||
|
return true;
|
||||||
|
if(spellInfo->activeIconID == 2158) //flight
|
||||||
|
return true;
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsAutocastableSpell(uint32 spellId)
|
bool IsAutocastableSpell(uint32 spellId)
|
||||||
@@ -313,6 +317,8 @@ bool IsAutocastableSpell(uint32 spellId)
|
|||||||
return false;
|
return false;
|
||||||
if(spellInfo->Attributes & SPELL_ATTR_PASSIVE)
|
if(spellInfo->Attributes & SPELL_ATTR_PASSIVE)
|
||||||
return false;
|
return false;
|
||||||
|
if(spellInfo->activeIconID == 2158)
|
||||||
|
return false;
|
||||||
if(spellInfo->AttributesEx & SPELL_ATTR_EX_UNAUTOCASTABLE_BY_PET)
|
if(spellInfo->AttributesEx & SPELL_ATTR_EX_UNAUTOCASTABLE_BY_PET)
|
||||||
return false;
|
return false;
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
Reference in New Issue
Block a user