mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11069] Set aggro for player controlled units only at zone aggro.

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
Schmoozerd 2011-01-25 14:11:56 +03:00 • committed by VladimirMangos
parent d699d0973b
commit 5951d77a0d
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/Unit.cpp
View file

@ -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())

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "11068"
#define REVISION_NR "11069"
#endif // __REVISION_NR_H__