Core/Vehicles: Players cannot enter a vehicle when in combat. Fixes issue 1966.

--HG-- branch : trunk
2010-08-18 06:51:59 +01:00
parent c0f3a7f9ef
commit e20a541494
1 changed files with 3 additions and 0 deletions
@@ -16358,6 +16358,9 @@ void Unit::EnterVehicle(Vehicle *vehicle, int8 seatId)

    if (GetTypeId() == TYPEID_PLAYER)
    {
+        if(this->ToPlayer()->isInCombat())
+            return;
+
        this->ToPlayer()->InterruptNonMeleeSpells(false);
        this->ToPlayer()->StopCastingCharm();
        this->ToPlayer()->StopCastingBindSight();