From e20a541494952a762aea01a81f5b7b2a56b47237 Mon Sep 17 00:00:00 2001
From: enjoi <none@none>
Date: Wed, 18 Aug 2010 06:51:59 +0100
Subject: [PATCH] Core/Vehicles: Players cannot enter a vehicle when in combat.
 Fixes issue 1966.

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 28c6240ce4..52dcb7915d 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -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();