Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-30 05:43:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Custom logic for putting people in combat instead of relying on CreatureAI or Creature methods.

Browse Source 
(cherry picked from commit 6a8524c068)
This commit is contained in:
treeston
2015-09-25 15:14:53 +02:00
committed by MitchesD
parent 89357f5425
commit 0bf78d5761
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -553,10 +553,25 @@ void Creature::Update(uint32 diff)
if (m_combatPulseTime == 0)
{
if (AI())
AI()->DoZoneInCombat();
else
SetInCombatWithZone();
Map::PlayerList const &players = GetMap()->GetPlayers();
if (!players.isEmpty())
for (Map::PlayerList::const_iterator it = players.begin(); it != players.end(); ++it)
{
if (Player* player = it->GetSource())
{
if (player->IsGameMaster())
continue;
if (player->IsAlive() && this->IsHostileTo(player))
{
if (CanHaveThreatList())
AddThreat(player, 0.0f);
this->SetInCombatWith(player);
player->SetInCombatWith(this);
}
}
}
m_combatPulseTime = m_combatPulseDelay * IN_MILLISECONDS;
}
}