From 40cdf0750d40668692660db817c5fc19d53aea2e Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Fri, 21 Jul 2023 00:19:48 +0200
Subject: 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(+)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index e73cc7bcf59..a8d6a9871f5 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -9473,6 +9473,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());
 
-- 
cgit v1.2.3