diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-12-28 11:45:46 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-12-28 11:45:46 -0500 |
| commit | ff5b0a14a4e542a102b9adb84bc8e1ee7396180b (patch) | |
| tree | e559cbebd9afbd6058f06e1a23bdaabd77450644 /src/server/game/Spells | |
| parent | 06d44ad32d2583c1085b8d7754ac26d9d58cd01f (diff) | |
| parent | 4065b17c94859a7e7e312c0db621d9990095201e (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into mmaps
Diffstat (limited to 'src/server/game/Spells')
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 745a7baab8f..131d84c7fc1 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -454,6 +454,11 @@ int32 AuraEffect::CalculateAmount(Unit* caster) // custom amount calculations go here switch (GetAuraType()) { + // Control vehicle auras should not get m_amount sum out of basepoints and DieSide calculated together, + // but only from basepoints. Only such aura case fow now so handle it here. + case SPELL_AURA_CONTROL_VEHICLE: + m_amount = m_baseAmount; + break; // crowd control auras case SPELL_AURA_MOD_CONFUSE: case SPELL_AURA_MOD_FEAR: @@ -3199,7 +3204,6 @@ void AuraEffect::HandleAuraControlVehicle(AuraApplication const* aurApp, uint8 m if (apply) { - // correct amount is already calculated adding one more -1 meant calculated amount - 1 caster->_EnterVehicle(target->GetVehicleKit(), m_amount, aurApp); } else diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 9714e2bc09b..e1cbb975399 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3619,6 +3619,9 @@ void SpellMgr::LoadDbcDataCorrections() case 40167: // Introspection spellInfo->Attributes |= SPELL_ATTR0_NEGATIVE_1; break; + case 45524: // Chains of Ice + spellInfo->EffectImplicitTargetA[EFFECT_2] = 0; + break; case 2378: // Minor Fortitude spellInfo->manaCost = 0; spellInfo->manaPerSecond = 0; |