diff options
| author | Shauren <none@none> | 2010-08-19 16:40:47 +0200 |
|---|---|---|
| committer | Shauren <none@none> | 2010-08-19 16:40:47 +0200 |
| commit | a693f49bd1cf9fb43b7da4172a1ba66369047a7d (patch) | |
| tree | b10d50448ab3109a83a39a65bd917c11f426c1a0 /src/server/game | |
| parent | 46438f9f92c52deef2c6f0ed35402885127eeeb7 (diff) | |
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
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |