diff options
Diffstat (limited to 'src/game/Player.cpp')
| -rw-r--r-- | src/game/Player.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 937b92a47b1..1f6a461a0b9 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -16569,6 +16569,8 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent) void Player::StopCastingCharm() { + ExitVehicle(); + Unit* charm = GetCharm(); if(!charm) return; @@ -16577,8 +16579,6 @@ void Player::StopCastingCharm() { if(((Creature*)charm)->isPet() && ((Pet*)charm)->getPetType() == POSSESSED_PET) ((Pet*)charm)->Remove(PET_SAVE_AS_DELETED); - else if(((Creature*)charm)->isVehicle()) - ((Vehicle*)charm)->RemovePassenger(this); } if(GetCharmGUID()) { |