Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Entities/Object/Object.cpp src/server/game/Movement/Spline/MovementPacketBuilder.cpp
This commit is contained in:
@@ -108,6 +108,14 @@ void ScriptedAI::AttackStartNoMove(Unit* who)
|
||||
DoStartNoMovement(who);
|
||||
}
|
||||
|
||||
void ScriptedAI::AttackStart(Unit* who)
|
||||
{
|
||||
if (IsCombatMovementAllowed())
|
||||
CreatureAI::AttackStart(who);
|
||||
else
|
||||
AttackStartNoMove(who);
|
||||
}
|
||||
|
||||
void ScriptedAI::UpdateAI(uint32 const /*diff*/)
|
||||
{
|
||||
//Check if we have a current target
|
||||
|
||||
Reference in New Issue
Block a user