From 527064c8d6623333afab0ac48ee5a425391ecc4b Mon Sep 17 00:00:00 2001 From: xvwyh <43143822+xvwyh@users.noreply.github.com> Date: Tue, 14 Jan 2020 20:42:30 +0200 Subject: [PATCH] Core/DynamicObjects: Restore the ability of DynamicObjects to be world objects which was accidentally removed in f0f4a620fbeef9cc450d1294c1964fe98e45645d breaking Far Sight (#24046) Fixes #17081 --- src/server/game/Maps/Map.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index e4070bf356..fc19ed95ef 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -363,7 +363,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); }