From 4b7aefb05ba8862c99a6ed46b39d4b2169413b8b Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 21 Jul 2023 00:19:48 +0200 Subject: [PATCH] Core/Units: Fixed crash (previously was a memory leak) when vehicle creatures are deleted without ever being added to world Closes #29166 --- src/server/game/Entities/Unit/Unit.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 81a424f849..e56ca8016c 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -9586,6 +9586,12 @@ void Unit::CleanupBeforeRemoveFromMap(bool finalCleanup) if (IsInWorld()) RemoveFromWorld(); + else + { + // cleanup that must happen even if not in world + if (IsVehicle()) + RemoveVehicleKit(true); + } ASSERT(GetGUID());