diff options
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index f2549dcf621..bd4e771a74e 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -20745,7 +20745,20 @@ void Player::StopCastingCharm() if (charm->ToCreature()->HasUnitTypeMask(UNIT_MASK_PUPPET)) static_cast<Puppet*>(charm)->UnSummon(); else if (charm->IsVehicle()) + { ExitVehicle(); + + // Temporary for issue https://github.com/TrinityCore/TrinityCore/issues/24876 + if (!GetCharmedGUID().IsEmpty() && !charm->HasAuraTypeWithCaster(SPELL_AURA_CONTROL_VEHICLE, GetGUID())) + { + TC_LOG_FATAL("entities.player", "Player::StopCastingCharm Player '%s' (%s) is not able to uncharm vehicle (%s) because of missing SPELL_AURA_CONTROL_VEHICLE", + GetName().c_str(), GetGUID().ToString().c_str(), GetCharmedGUID().ToString().c_str()); + + // attempt to recover from missing HandleAuraControlVehicle unapply handling + // THIS IS A HACK, NEED TO FIND HOW IS IT EVEN POSSBLE TO NOT HAVE THE AURA + _ExitVehicle(); + } + } } if (GetCharmedGUID()) charm->RemoveCharmAuras(); |