feat(NPC): add configuration for creature repositioning during NPC combat (#22973)

Co-authored-by: Andrew <47818697+Nyeriah@users.noreply.github.com>
This commit is contained in:
Yehonal
2025-09-20 03:49:50 +02:00
committed by GitHub
parent 857559616c
commit 09b79f45f2
4 changed files with 26 additions and 4 deletions

View File

@@ -27,6 +27,7 @@
#include "Player.h"
#include "ScriptMgr.h"
#include "TemporarySummon.h"
#include "World.h"
#include "Vehicle.h"
#include "ZoneScript.h"
#include <functional>
@@ -364,13 +365,18 @@ void CreatureAI::MoveCircleChecks()
if (
!victim ||
!me->IsFreeToMove() || me->HasUnitMovementFlag(MOVEMENTFLAG_ROOT) ||
!me->IsWithinMeleeRange(victim) || me == victim->GetVictim() ||
(!victim->IsPlayer() && !victim->IsPet()) // only player & pets to save CPU
!me->IsWithinMeleeRange(victim) || me == victim->GetVictim()
)
{
return;
}
/**
* optimization, disable circling movement for NPC vs NPC combat
*/
if (!sWorld->getBoolConfig(CONFIG_CREATURE_REPOSITION_AGAINST_NPCS) && !victim->IsPlayer() && !victim->IsPet())
return;
me->GetMotionMaster()->MoveCircleTarget(me->GetVictim());
}
@@ -378,8 +384,13 @@ void CreatureAI::MoveBackwardsChecks()
{
Unit *victim = me->GetVictim();
if (!victim || !me->IsFreeToMove() || me->HasUnitMovementFlag(MOVEMENTFLAG_ROOT) ||
(!victim->IsPlayer() && !victim->IsPet()))
if (!victim || !me->IsFreeToMove() || me->HasUnitMovementFlag(MOVEMENTFLAG_ROOT))
return;
/**
* optimization, disable backwards movement for NPC vs NPC combat
*/
if (!sWorld->getBoolConfig(CONFIG_CREATURE_REPOSITION_AGAINST_NPCS) && !victim->IsPlayer() && !victim->IsPet())
{
return;
}