diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Creature/CreatureGroups.cpp | 9 | ||||
| -rw-r--r-- | src/server/game/Grids/GridDefines.h | 1 | ||||
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 20 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 2 |
4 files changed, 23 insertions, 9 deletions
diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp index b622618de53..f29e896f050 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.cpp +++ b/src/server/game/Entities/Creature/CreatureGroups.cpp @@ -227,15 +227,8 @@ void CreatureGroup::LeaderMoveTo(float x, float y, float z) continue; if (itr->second->point_1) - { if (m_leader->GetCurrentWaypointID() == itr->second->point_1 - 1 || m_leader->GetCurrentWaypointID() == itr->second->point_2 - 1) - { - if (itr->second->follow_angle > float(M_PI)) - itr->second->follow_angle = itr->second->follow_angle - float(M_PI); - else - itr->second->follow_angle = itr->second->follow_angle + float(M_PI); - } - } + itr->second->follow_angle = float(M_PI) * 2 - itr->second->follow_angle; float angle = itr->second->follow_angle; float dist = itr->second->follow_dist; diff --git a/src/server/game/Grids/GridDefines.h b/src/server/game/Grids/GridDefines.h index 3572fff63dd..8eae906ba87 100644 --- a/src/server/game/Grids/GridDefines.h +++ b/src/server/game/Grids/GridDefines.h @@ -20,6 +20,7 @@ #define TRINITY_GRIDDEFINES_H #include "Common.h" +#include "ObjectGuid.h" #include "NGrid.h" #include <cmath> diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 22cc1f1bbd0..b50099b9787 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -678,6 +678,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 diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 022c38a6ff0..b4a7e7a4864 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -2997,7 +2997,7 @@ AuctionHouseBot.Items.Amount.Orange = 0 AuctionHouseBot.Items.Amount.Yellow = 0 # -# AustionHouseBot.Class.* +# AuctionHouseBot.Class.* # Description: Here you can set the class of items you prefer to be show on AH # These value are sorted by preference, from 0 (disabled) to 10 (max. preference) # Default: Consumable: 6 |