diff options
| author | Machiavelli <none@none> | 2010-08-19 16:43:50 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2010-08-19 16:43:50 +0200 |
| commit | 717aac1663dfcf9b47593ed9fb458c3a995d92a5 (patch) | |
| tree | 320256ebe529d7a0f86b0f5dfcdf7294c65ed8c4 /src/server/game | |
| parent | 17d0382cd473f465d7dec6d894dbea377979f201 (diff) | |
| parent | a693f49bd1cf9fb43b7da4172a1ba66369047a7d (diff) | |
Merge
--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); |