diff options
| author | enjoi <none@none> | 2010-08-18 06:51:59 +0100 |
|---|---|---|
| committer | enjoi <none@none> | 2010-08-18 06:51:59 +0100 |
| commit | e20a541494952a762aea01a81f5b7b2a56b47237 (patch) | |
| tree | 3ce6e74ba66f2ad72db411f73cb5ebd4f672fda6 | |
| parent | c0f3a7f9efaa10283260cbedae6e7c7c9180b524 (diff) | |
Core/Vehicles: Players cannot enter a vehicle when in combat. Fixes issue 1966.
--HG--
branch : trunk
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 28c6240ce40..52dcb7915d5 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(); |