mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-02-05 16:39:08 +01:00
*Let all accessories enterevademode when vehicle enter evade mode.
--HG-- branch : trunk
This commit is contained in:
@@ -23,6 +23,7 @@
|
||||
#include "Creature.h"
|
||||
#include "World.h"
|
||||
#include "SpellMgr.h"
|
||||
#include "Vehicle.h"
|
||||
|
||||
//Disable CreatureAI when charmed
|
||||
void CreatureAI::OnCharmed(bool apply)
|
||||
@@ -211,6 +212,9 @@ void CreatureAI::EnterEvadeMode()
|
||||
me->GetMotionMaster()->MoveTargetedHome();
|
||||
}
|
||||
|
||||
if(me->isVehicle())
|
||||
((Vehicle*)me)->InstallAllAccessories();
|
||||
|
||||
Reset();
|
||||
}
|
||||
|
||||
|
||||
@@ -254,8 +254,12 @@ void Vehicle::InstallAccessory(uint32 entry, int8 seatId)
|
||||
{
|
||||
// already installed
|
||||
if(passenger->GetEntry() == entry)
|
||||
{
|
||||
assert(passenger->GetTypeId() == TYPEID_UNIT);
|
||||
if(IsInEvadeMode() && ((Creature*)passenger)->AI())
|
||||
((Creature*)passenger)->AI()->EnterEvadeMode();
|
||||
return;
|
||||
|
||||
}
|
||||
passenger->ExitVehicle(); // this should not happen
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user