Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 19:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4641 from Subv/fix001

Browse Source 
Core/Vehicles: Vehicles with SAI should not kick their passengers when resetting
This commit is contained in:
Shocker
2012-01-05 19:20:13 -08:00
parent e0bafc73f8 235b941964
commit 33de07e2dc
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/server/game/AI/SmartScripts/SmartAI.cpp
View File

@@ -431,12 +431,36 @@ void SmartAI::MovementInform(uint32 MovementType, uint32 Data)
MovepointReached(Data);
}
void SmartAI::RemoveAuras()
{
Unit::AuraApplicationMap appliedAuras = me->GetAppliedAuras();
for (Unit::AuraApplicationMap::iterator iter = appliedAuras.begin(); iter != appliedAuras.end();)
{
Aura const* aura = iter->second->GetBase();
if (!aura->GetSpellInfo()->HasAura(SPELL_AURA_CONTROL_VEHICLE) && !(iter->second->GetTarget() == me && aura->GetCaster() == me))
me->_UnapplyAura(iter, AURA_REMOVE_BY_DEFAULT);
else
++iter;
}
Unit::AuraMap ownedAuras = me->GetOwnedAuras();
for (Unit::AuraMap::iterator iter = ownedAuras.begin(); iter != ownedAuras.end();)
{
Aura* aura = iter->second;
if (!aura->GetSpellInfo()->HasAura(SPELL_AURA_CONTROL_VEHICLE))
me->RemoveOwnedAura(iter, AURA_REMOVE_BY_DEFAULT);
else
++iter;
}
}
void SmartAI::EnterEvadeMode()
{
if (!me->isAlive())
return;
me->RemoveAllAuras();
RemoveAuras();
me->DeleteThreatList();
me->CombatStop(true);
me->LoadCreaturesAddon();

2
src/server/game/AI/SmartScripts/SmartAI.h
View File

@@ -193,6 +193,8 @@ class SmartAI : public CreatureAI
mDespawnState = t ? 1 : 0;
}
void StartDespawn() { mDespawnState = 2; }
void RemoveAuras();
private:
uint32 mFollowCreditType;