mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-15 12:31:31 +00:00
This reverts commit 14f48fcc9336406a0673578c8f5433e278c7cac5.
This commit is contained in:
parent
14f48fcc93
commit
49d751b3d5
@ -456,12 +456,7 @@ bool Mob::CheckWillAggro(Mob *mob) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Don't aggro new clients if we are already engaged unless PROX_AGGRO is set
|
// Don't aggro new clients if we are already engaged unless PROX_AGGRO is set
|
||||||
|
if (IsEngaged() && (!GetSpecialAbility(PROX_AGGRO) || (GetSpecialAbility(PROX_AGGRO) && !CombatRange(mob)))) {
|
||||||
// Frustrated mobs (all rooted up with no one to kill)
|
|
||||||
// will engage without PROX_AGGRO ability if someone new is close now.
|
|
||||||
bool is_frustrated = (IsRooted() && !CombatRange(target));
|
|
||||||
|
|
||||||
if (!is_frustrated && IsEngaged() && (!GetSpecialAbility(PROX_AGGRO) || (GetSpecialAbility(PROX_AGGRO) && !CombatRange(mob)))) {
|
|
||||||
LogAggro(
|
LogAggro(
|
||||||
"[{}] is in combat, and does not have prox_aggro, or does and is out of combat range with [{}]",
|
"[{}] is in combat, and does not have prox_aggro, or does and is out of combat range with [{}]",
|
||||||
GetName(),
|
GetName(),
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user