aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps/Map.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2015-09-30 00:31:21 +0200
committerjackpoz <giacomopoz@gmail.com>2015-09-30 19:58:09 +0200
commit325336137d7855e17feb02a56ea3fcd605ddfc33 (patch)
tree7cf6ce0a799fce34bf698cde6f558e7494abf75f /src/server/game/Maps/Map.cpp
parentd028f33ed9c18449b1d4c902c3837b4679374f1f (diff)
Core/Transports: Fixed accessing deleted instance transports
Thanks @jackpoz for valgrind log and @pete318 for reproduction steps Closes #15633 (cherry picked from commit 8745e08be020471db886e11a3a7512a751141562)
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
-rw-r--r--src/server/game/Maps/Map.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 7acafb3c341..2af77ffdec3 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -405,6 +405,13 @@ void Map::DeleteFromWorld(Player* player)
delete player;
}
+template<>
+void Map::DeleteFromWorld(Transport* transport)
+{
+ ObjectAccessor::RemoveObject(transport);
+ delete transport;
+}
+
void Map::EnsureGridCreated(const GridCoord &p)
{
std::lock_guard<std::mutex> lock(_gridLock);