aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2021-02-06 11:36:56 +0100
committerShauren <shauren.trinity@gmail.com>2022-03-06 20:01:38 +0100
commitc93d6856c727b5919ae30e04fb17bb425370ebea (patch)
treea231ac65668e16644811290daf9b24172604c18b /src
parent730a8da9e99fdb50459e9eb57d79ac995430125e (diff)
Core/Unit: Fix crash when exiting a vehicle
Ref #25649 (cherry picked from commit b84b92506354fc37017cb687aac263218265cf06)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp6
1 files changed, 6 insertions, 0 deletions
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