From 550f59e05f81f9b898c463b4379ff72a4d7b0fa6 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Wed, 23 Feb 2011 17:41:33 +0100 Subject: Core/Vehicles: Do not allow Unit A to enter vehicle of unit B, when unit B is already on vehicle of unit A. Fixes a core deadlock and stack overflow as well as client crash in the event of improper scripts. --- src/server/game/Entities/Unit/Unit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 521ee929484..c63510d39a9 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -16423,7 +16423,7 @@ bool Unit::CheckPlayerCondition(Player* pPlayer) void Unit::EnterVehicle(Vehicle *vehicle, int8 seatId, AuraApplication const * aurApp) { - if (!isAlive() || GetVehicleKit() == vehicle) + if (!isAlive() || GetVehicleKit() == vehicle || vehicle->GetBase()->IsOnVehicle(this)) return; if (m_vehicle) -- cgit v1.2.3