aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps/Map.cpp
diff options
context:
space:
mode:
authorxvwyh <43143822+xvwyh@users.noreply.github.com>2020-01-14 20:42:30 +0200
committerShauren <shauren.trinity@gmail.com>2021-12-20 21:22:37 +0100
commit9b79d1b410de03cd74fee90d952dcb37b82e257b (patch)
tree46445100881ea177fa969256d451d51b6ec1ac7e /src/server/game/Maps/Map.cpp
parent01023320cf839718fafd6cd424b63dafc1632bbb (diff)
Core/DynamicObjects: Restore the ability of DynamicObjects to be world objects which was accidentally removed in f0f4a620fbeef9cc450d1294c1964fe98e45645d breaking Far Sight (#24046)
Fixes #17081 (cherry picked from commit d4ba47a76e71a0ac103a1ff9b892593bc9c6a67a)
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
-rw-r--r--src/server/game/Maps/Map.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index e1b8b99bd8b..01e797e576b 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -411,7 +411,10 @@ template<>
void Map::AddToGrid(DynamicObject* obj, Cell const& cell)
{
NGridType* grid = getNGrid(cell.GridX(), cell.GridY());
- grid->GetGridType(cell.CellX(), cell.CellY()).AddGridObject(obj);
+ if (obj->IsWorldObject())
+ grid->GetGridType(cell.CellX(), cell.CellY()).AddWorldObject(obj);
+ else
+ grid->GetGridType(cell.CellX(), cell.CellY()).AddGridObject(obj);
obj->SetCurrentCell(cell);
}