sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/Spells): Fixed displaying runes cooldowns. (#11250)

Browse Source 
Fixes #11186
This commit is contained in:
UltraNix
2022-04-02 12:27:33 +02:00
committed by GitHub
parent 285504e79d
commit 341154fee4
1 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Spell.cpp
+29 -4
View File
@@ -4474,11 +4474,23 @@ void Spell::SendSpellStart()
if (m_spellInfo->HasAttribute(SPELL_ATTR0_USES_RANGED_SLOT) || m_spellInfo->HasAttribute(SPELL_ATTR0_CU_NEEDS_AMMO_DATA)) if (m_spellInfo->HasAttribute(SPELL_ATTR0_USES_RANGED_SLOT) || m_spellInfo->HasAttribute(SPELL_ATTR0_CU_NEEDS_AMMO_DATA))
castFlags |= CAST_FLAG_PROJECTILE; castFlags |= CAST_FLAG_PROJECTILE;
if ((m_caster->GetTypeId() == TYPEID_PLAYER || (m_caster->GetTypeId() == TYPEID_UNIT && m_caster->IsPet())) if (m_caster->GetTypeId() == TYPEID_PLAYER || m_caster->IsPet())
&& m_spellInfo->PowerType != POWER_HEALTH && m_powerCost != 0) {
switch (m_spellInfo->PowerType)
{
case POWER_HEALTH:
break;
case POWER_RUNE:
castFlags |= CAST_FLAG_POWER_LEFT_SELF;
break;
default:
if (m_powerCost != 0)
{ {
castFlags |= CAST_FLAG_POWER_LEFT_SELF; castFlags |= CAST_FLAG_POWER_LEFT_SELF;
} }
break;
}
}
if (m_spellInfo->RuneCostID && m_spellInfo->PowerType == POWER_RUNE) if (m_spellInfo->RuneCostID && m_spellInfo->PowerType == POWER_RUNE)
castFlags |= CAST_FLAG_NO_GCD; // not needed, but Blizzard sends it castFlags |= CAST_FLAG_NO_GCD; // not needed, but Blizzard sends it
@@ -4532,11 +4544,24 @@ void Spell::SendSpellGo()
if (m_spellInfo->HasAttribute(SPELL_ATTR0_USES_RANGED_SLOT) || m_spellInfo->HasAttribute(SPELL_ATTR0_CU_NEEDS_AMMO_DATA)) if (m_spellInfo->HasAttribute(SPELL_ATTR0_USES_RANGED_SLOT) || m_spellInfo->HasAttribute(SPELL_ATTR0_CU_NEEDS_AMMO_DATA))
castFlags |= CAST_FLAG_PROJECTILE; // arrows/bullets visual castFlags |= CAST_FLAG_PROJECTILE; // arrows/bullets visual
if ((m_caster->GetTypeId() == TYPEID_PLAYER || (m_caster->GetTypeId() == TYPEID_UNIT && m_caster->IsPet())) // should only be sent to self, but the current messaging doesn't make that possible
&& m_spellInfo->PowerType != POWER_HEALTH && m_powerCost != 0) // should only be sent to self, but the current messaging doesn't make that possible if (m_caster->GetTypeId() == TYPEID_PLAYER || m_caster->IsPet())
{
switch (m_spellInfo->PowerType)
{
case POWER_HEALTH:
break;
case POWER_RUNE:
castFlags |= CAST_FLAG_POWER_LEFT_SELF;
break;
default:
if (m_powerCost != 0)
{ {
castFlags |= CAST_FLAG_POWER_LEFT_SELF; castFlags |= CAST_FLAG_POWER_LEFT_SELF;
} }
break;
}
}
if ((m_caster->GetTypeId() == TYPEID_PLAYER) if ((m_caster->GetTypeId() == TYPEID_PLAYER)
&& (m_caster->getClass() == CLASS_DEATH_KNIGHT) && (m_caster->getClass() == CLASS_DEATH_KNIGHT)