diff options
Diffstat (limited to 'src')
| -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(); |