From 49d751b3d5e14077dba4e349af46b222cdac1b59 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" <277429+mackal@users.noreply.github.com> Date: Fri, 27 May 2022 11:40:43 -0400 Subject: [PATCH] Revert "[Aggro] Rooted mobs will add other hated targets to Hate list (#2180)" (#2214) This reverts commit 14f48fcc9336406a0673578c8f5433e278c7cac5. --- zone/aggro.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/zone/aggro.cpp b/zone/aggro.cpp index 0de43c3ca..4d020ce3d 100644 --- a/zone/aggro.cpp +++ b/zone/aggro.cpp @@ -456,12 +456,7 @@ bool Mob::CheckWillAggro(Mob *mob) { } // Don't aggro new clients if we are already engaged unless PROX_AGGRO is set - - // 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)))) { + if (IsEngaged() && (!GetSpecialAbility(PROX_AGGRO) || (GetSpecialAbility(PROX_AGGRO) && !CombatRange(mob)))) { LogAggro( "[{}] is in combat, and does not have prox_aggro, or does and is out of combat range with [{}]", GetName(),