Merge pull request #8157 from Naios/mount_system

[4.3.4] Fixed an mistake in AuraEffect::HandleAuraMounted that causes incorrect remove of related mount speed increasing auras #8123
This commit is contained in:
Shauren committed 2012-10-24 08:58:06 -07:00
commit 253e4b1928
1 file changed
+4 -1
@@ -717,7 +717,10 @@ int32 AuraEffect::CalculateAmount(Unit* caster)
break;
case SPELL_AURA_MOUNTED:
if (MountCapabilityEntry const* mountCapability = GetBase()->GetUnitOwner()->GetMountCapability(uint32(GetMiscValueB())))
{
amount = mountCapability->Id;
m_canBeRecalculated = false;
}
break;
case SPELL_AURA_MOD_RESISTANCE_EXCLUSIVE:
{
@@ -2809,7 +2812,7 @@ void AuraEffect::HandleAuraMounted(AuraApplication const* aurApp, uint8 mode, bo
target->RemoveAurasByType(SPELL_AURA_MOUNTED);
// remove speed aura
if (MountCapabilityEntry const* mountCapability = target->GetMountCapability(uint32(GetMiscValueB())))
if (MountCapabilityEntry const* mountCapability = sMountCapabilityStore.LookupEntry(GetAmount()))
target->RemoveAurasDueToSpell(mountCapability->SpeedModSpell, target->GetGUID());
}
}