aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2021-02-06 11:36:56 +0100
committerjackpoz <giacomopoz@gmail.com>2021-02-06 11:36:56 +0100
commitb84b92506354fc37017cb687aac263218265cf06 (patch)
tree1cf61ebb643be26d97d4c5a58766f4d758c82c36
parent4cc1f850670b868a1d16833a2cf5c60715f749ef (diff)
Core/Unit: Fix crash when exiting a vehicle
Ref #25649
-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 e6700276845..b2fa0d64bf1 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -12662,6 +12662,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