mirror of
https://github.com/mangosfour/server.git
synced 2025-12-21 01:37:05 +00:00
Backports from 400 branch.
This commit is contained in:
parent
bf774f49ce
commit
76dfdd336f
32 changed files with 223 additions and 210 deletions
|
|
@ -6401,7 +6401,6 @@ bool Spell::IsNeedSendToClient() const
|
|||
m_spellInfo->speed > 0.0f || (!m_triggeredByAuraSpell && !m_IsTriggeredSpell);
|
||||
}
|
||||
|
||||
|
||||
bool Spell::IsTriggeredSpellWithRedundentData() const
|
||||
{
|
||||
return m_IsTriggeredSpell && (m_spellInfo->manaCost || m_spellInfo->ManaCostPercentage);
|
||||
|
|
@ -6810,7 +6809,7 @@ void Spell::TriggerGlobalCooldown()
|
|||
// global cooldown can't leave range 1..1.5 secs (if it it)
|
||||
// exist some spells (mostly not player directly casted) that have < 1 sec and > 1.5 sec global cooldowns
|
||||
// but its as test show not affected any spell mods.
|
||||
if (m_spellInfo->StartRecoveryTime >= 1000 && m_spellInfo->StartRecoveryTime <= 1500)
|
||||
if (gcd >= 1000 && gcd <= 1500)
|
||||
{
|
||||
// gcd modifier auras applied only to self spells and only player have mods for this
|
||||
if (m_caster->GetTypeId() == TYPEID_PLAYER)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue