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

Merge pull request #15538 from pete318/combat_bug

Browse Source 
Combat with distant creatures (Mk II)
(cherry picked from commit a40d855337)
This commit is contained in:
Carbenium
2015-09-23 22:32:03 +02:00
parent a53a8fff98
commit 512c2ab83c
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/server/game/Maps/Map.cpp
View File

@@ -689,6 +689,26 @@ void Map::Update(const uint32 t_diff)
player->Update(t_diff);
VisitNearbyCellsOf(player, grid_object_update, world_object_update);
// Handle updates for creatures in combat with player and are more than 60 yards away
if (player->IsInCombat())
{
std::vector<Creature*> updateList;
HostileReference* ref = player->getHostileRefManager().getFirst();
while (ref)
{
if (Unit* unit = ref->GetSource()->GetOwner())
if (unit->ToCreature() && unit->GetMapId() == player->GetMapId() && !unit->IsWithinDistInMap(player, GetVisibilityRange(), false))
updateList.push_back(unit->ToCreature());
ref = ref->next();
}
// Process deferred update list for player
for (Creature* c : updateList)
VisitNearbyCellsOf(c, grid_object_update, world_object_update);
}
}
// non-player active objects, increasing iterator in the loop in case of object removal