From 5951d77a0d2c6ae7538f6a38b138cf8b81e7ae21 Mon Sep 17 00:00:00 2001 From: Schmoozerd Date: Tue, 25 Jan 2011 14:11:56 +0300 Subject: [PATCH] [11069] Set aggro for player controlled units only at zone aggro. Signed-off-by: VladimirMangos --- src/game/Unit.cpp | 2 +- src/shared/revision_nr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 575a047d9..032e98edc 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -7724,7 +7724,7 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy) pCreature->AI()->EnterCombat(enemy); // Some bosses are set into combat with zone - if (GetMap()->IsDungeon() && (pCreature->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_AGGRO_ZONE)) + if (GetMap()->IsDungeon() && (pCreature->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_AGGRO_ZONE) && enemy && enemy->IsControlledByPlayer()) pCreature->SetInCombatWithZone(); if (InstanceData* mapInstance = GetInstanceData()) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 4e28d3ff5..195b16328 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11068" + #define REVISION_NR "11069" #endif // __REVISION_NR_H__