Core/Transports: Fixed crashes when instance with transports unloads

Closes #11056

2 files changed, 3 insertions, 0 deletions

diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp
index f9a0a7bb5e7..59359e59fdc 100644
--- a/src/server/game/Entities/Transport/Transport.cpp
+++ b/src/server/game/Entities/Transport/Transport.cpp
@@ -39,6 +39,7 @@ Transport::Transport() : GameObject(),
 
 Transport::~Transport()
 {
+    UnloadStaticPassengers();
 }
 
 bool Transport::Create(uint32 guidlow, uint32 entry, uint32 mapid, float x, float y, float z, float ang, uint32 animprogress)
diff --git a/src/server/game/Entities/Transport/Transport.h b/src/server/game/Entities/Transport/Transport.h
index 22a54e8428d..0d020fe2c34 100644
--- a/src/server/game/Entities/Transport/Transport.h
+++ b/src/server/game/Entities/Transport/Transport.h
@@ -67,6 +67,8 @@ class Transport : public GameObject, public TransportBase
 
         void EnableMovement(bool enabled);
 
+        TransportTemplate const* GetTransportTemplate() const { return _transportInfo; }
+
     private:
         void MoveToNextWaypoint();
         float CalculateSegmentPos(float perc);