From c93d6856c727b5919ae30e04fb17bb425370ebea Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sat, 6 Feb 2021 11:36:56 +0100 Subject: Core/Unit: Fix crash when exiting a vehicle Ref #25649 (cherry picked from commit b84b92506354fc37017cb687aac263218265cf06) --- src/server/game/Entities/Unit/Unit.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/server/game/Entities/Unit') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 60f7442e864..5022ff0ca33 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12029,6 +12029,12 @@ void Unit::_ExitVehicle(Position const* exitPosition) VehicleSeatAddon const* seatAddon = m_vehicle->GetSeatAddonForSeatOfPassenger(this); Vehicle* vehicle = m_vehicle->RemovePassenger(this); + if (!vehicle) + { + TC_LOG_ERROR("entities.vehicle", "RemovePassenger() couldn't remove current unit from vehicle. Debug info: %s", GetDebugInfo().c_str()); + return; + } + Player* player = ToPlayer(); // If the player is on mounted duel and exits the mount, he should immediatly lose the duel -- cgit v1.2.3