josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Vehicles: Properly remove casted vehicle auras (caster guid is what we must check, not owner)

Browse Source
This commit is contained in:
Shauren
2011-03-20 00:21:13 +01:00
parent f11be7cfed
commit 606c890960
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+2 -12
View File
@@ -3770,7 +3770,7 @@ void Unit::RemoveAurasByType(AuraType auraType, uint64 casterGUID, Aura * except
for (AuraEffectList::iterator iter = m_modAuras[auraType].begin(); iter != m_modAuras[auraType].end();) for (AuraEffectList::iterator iter = m_modAuras[auraType].begin(); iter != m_modAuras[auraType].end();)
{ {
Aura * aura = (*iter)->GetBase(); Aura * aura = (*iter)->GetBase();
AuraApplication * aurApp = aura ->GetApplicationOfTarget(GetGUID()); AuraApplication * aurApp = aura->GetApplicationOfTarget(GetGUID());
++iter; ++iter;
if (aura != except && (!casterGUID || aura->GetCasterGUID() == casterGUID) if (aura != except && (!casterGUID || aura->GetCasterGUID() == casterGUID)
@@ -16637,17 +16637,7 @@ void Unit::ExitVehicle(Position const* exitPosition)
if (!m_vehicle) if (!m_vehicle)
return; return;
Unit *vehicleBase = m_vehicle->GetBase(); GetVehicleBase()->RemoveAurasByType(SPELL_AURA_CONTROL_VEHICLE, GetGUID());
const AuraEffectList &modAuras = vehicleBase->GetAuraEffectsByType(SPELL_AURA_CONTROL_VEHICLE);
for (AuraEffectList::const_iterator itr = modAuras.begin(); itr != modAuras.end(); ++itr)
{
if ((*itr)->GetBase()->GetOwner() == this)
{
vehicleBase->RemoveAura((*itr)->GetBase());
break; // there should be no case that a vehicle has two auras for one owner
}
}
_ExitVehicle(exitPosition); _ExitVehicle(exitPosition);
} }