diff options
| author | Shauren <shauren.trinity@gmail.com> | 2012-10-24 08:58:06 -0700 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2012-10-24 08:58:06 -0700 |
| commit | 253e4b1928576b2d4f27ff7d10751d6ba9b8aae5 (patch) | |
| tree | ba4ae447607e869b091ca260403791a913ffb0dd /src | |
| parent | 60d4343d8e8183e170ec833b43ec1254d5752c80 (diff) | |
| parent | 38b5a6c7be25fef3b9b16adc82dfbfaeebd76f53 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 29c27bc871f..6a282d15241 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -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()); } } |