aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Holiver <none@none>2010-08-21 02:15:19 -0300
committerJohn Holiver <none@none>2010-08-21 02:15:19 -0300
commit6e6d62def91fb86e979d008d1732fdbbd466885d (patch)
tree568b97a734e9af703a7c282e622d41d42c8912f4 /src
parentfcca6060d0f4edc71b9862b06378943af355e683 (diff)
Core: Creature should aggro player when players aggro creature during SetInCombatWithZone (otherwise, creature will remain not in combat).
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 0f2bbcab186..d22463e844d 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -2148,6 +2148,7 @@ void Creature::SetInCombatWithZone()
if (pPlayer->isAlive())
{
+ this->SetInCombatWith(pPlayer);
pPlayer->SetInCombatWith(this);
AddThreat(pPlayer, 0.0f);
}