From 95152d57539064d8278e323899290cba2fb2b0cd Mon Sep 17 00:00:00 2001 From: Trista Date: Fri, 28 Dec 2012 04:11:06 +0200 Subject: [PATCH] Core/Vehicles: Closes all issues with seats for real (finishing and fixing previous change) * Author, Joschiwald, all credits to him please * DieSide should be not calculated with basepoints for these auras, thiss correctly finish previous fix 452e585f7b4b2bc349d7386b0c42cf296f0ab4c2 from Horn * What it fixes, FL, XT, Demolishers, Accessories, Not being able to leave vehicle and so many more can't track them sorry --- src/server/game/Spells/Auras/SpellAuraEffects.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 745a7baab8f..eade0b5e8b5 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