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
This commit is contained in:
Shauren
2010-08-19 16:40:47 +02:00
parent 46438f9f92
commit a693f49bd1
8 changed files with 55 additions and 37 deletions
+1 -1
View File
@@ -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);