aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorxvwyh <43143822+xvwyh@users.noreply.github.com>2020-01-14 20:42:30 +0200
committerGiacomo Pozzoni <giacomopoz@gmail.com>2020-01-14 19:42:30 +0100
commitd4ba47a76e71a0ac103a1ff9b892593bc9c6a67a (patch)
treee2ab9d6b0716a70ff0dd8dcb8860546018523f60 /src
parentf1c338f1371efe6e8a6b11dc45f3d450bc658d13 (diff)
Core/DynamicObjects: Restore the ability of DynamicObjects to be world objects which was accidentally removed in f0f4a620fbeef9cc450d1294c1964fe98e45645d breaking Far Sight (#24046)
Fixes #17081
Diffstat (limited to 'src')
-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 add703f617c..8001aa66412 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -336,7 +336,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);
}