diff options
| -rw-r--r-- | src/server/game/Server/Packets/SpellPackets.h | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellHistory.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Server/Packets/SpellPackets.h b/src/server/game/Server/Packets/SpellPackets.h index 76f4d7a1835..b45fce9d706 100644 --- a/src/server/game/Server/Packets/SpellPackets.h +++ b/src/server/game/Server/Packets/SpellPackets.h @@ -542,7 +542,7 @@ namespace WorldPackets WorldPacket const* Write() override; bool IsPet = false; - bool SkipCategory = false; + bool WithoutCategoryCooldown = false; int32 DeltaTime = 0; int32 SpellID = 0; }; diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index f08b1e872e1..0e636e14218 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -742,7 +742,7 @@ int32 AuraEffect::CalculateAmount(Unit* caster) Unit* unitOwner = GetBase()->GetOwner()->ToUnit(); // default amount calculation - int32 amount = GetSpellEffectInfo().CalcValue(caster, &m_baseAmount, unitOwner, nullptr, GetBase()->GetCastItemId(), GetBase()->GetCastItemLevel()); + int32 amount = GetSpellEffectInfo().CalcValue(caster, &m_baseAmount, unitOwner, nullptr); if (!m_spellInfo->HasAttribute(SPELL_ATTR8_MASTERY_AFFECTS_POINTS) || G3D::fuzzyEq(GetSpellEffectInfo().BonusCoefficient, 0.0f)) amount = GetSpellEffectInfo().CalcValue(caster, &m_baseAmount, GetBase()->GetOwner()->ToUnit()); diff --git a/src/server/game/Spells/SpellHistory.cpp b/src/server/game/Spells/SpellHistory.cpp index 10df8b51c0f..6fd37c5ac6e 100644 --- a/src/server/game/Spells/SpellHistory.cpp +++ b/src/server/game/Spells/SpellHistory.cpp @@ -622,7 +622,7 @@ void SpellHistory::ModifySpellCooldown(CooldownStorageType::iterator& itr, Durat modifyCooldown.IsPet = _owner != playerOwner; modifyCooldown.SpellID = itr->second.SpellId; modifyCooldown.DeltaTime = duration_cast<Milliseconds>(cooldownMod).count(); - modifyCooldown.SkipCategory = withoutCategoryCooldown; + modifyCooldown.WithoutCategoryCooldown = withoutCategoryCooldown; playerOwner->SendDirectMessage(modifyCooldown.Write()); } |