From a693f49bd1cf9fb43b7da4172a1ba66369047a7d Mon Sep 17 00:00:00 2001
From: Shauren <none@none>
Date: Thu, 19 Aug 2010 16:40:47 +0200
Subject: Vehicles: Prohibit entering vehicle in combat only if it is a
 multi-passenger mount Scripts/Icecrown Citadel: Changed Bone Spike id and
 remove teleport z+3 hack, its a vehicle, thx wowgargamel Scripts/Icecrown
 Citadel: Fixed typo in variable name, thx Paradox Scripts/Icecrown Citadel:
 Added warning emote for Bone Storm

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

(limited to 'src/server/game')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 31dae14c4c1..311ea7bacd0 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -16377,7 +16377,7 @@ void Unit::EnterVehicle(Vehicle *vehicle, int8 seatId)
 
     if (GetTypeId() == TYPEID_PLAYER)
     {
-        if(this->ToPlayer()->isInCombat())
+        if (vehicle->GetBase()->GetTypeId() == TYPEID_PLAYER && this->ToPlayer()->isInCombat())
             return;
 
         this->ToPlayer()->InterruptNonMeleeSpells(false);
-- 
cgit v1.2.3