Core/Spells: Always remove spell target from transport on teleport spells if spell destination does not target a position on the transport

This commit is contained in:
Shauren authored and Ovahlord committed 2023-06-29 20:31:45 +02:00
1 parent 82e27f72af
commit 07376de9fc
8 files changed
+47 -24

No files matched your search

+28 -8
View File
@@ -818,7 +818,24 @@ void Spell::CalculateJumpSpeeds(uint8 i, float dist, float & speedXY, float & sp
speedZ = std::sqrt(2 * Movement::gravity * height);
}
void Spell::EffectTeleportUnits(SpellEffIndex /*effIndex*/)
TeleportToOptions GetTeleportOptions(WorldObject const* caster, Unit const* unitTarget, SpellDestination const& targetDest)
{
TeleportToOptions options = TELE_TO_NONE;
if (caster == unitTarget)
options |= TELE_TO_SPELL;
if (targetDest._position.GetMapId() == unitTarget->GetMapId())
{
options |= TELE_TO_NOT_LEAVE_COMBAT | TELE_TO_NOT_UNSUMMON_PET;
if (unitTarget->GetTransGUID() == targetDest._transportGUID)
options |= TELE_TO_NOT_LEAVE_TRANSPORT;
}
return options;
}
void Spell::EffectTeleportUnits(SpellEffIndex effIndex)
{
if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET)
return;
@@ -841,15 +858,18 @@ void Spell::EffectTeleportUnits(SpellEffIndex /*effIndex*/)
if (!targetDest.GetOrientation() && m_targets.GetUnitTarget())
targetDest.SetOrientation(m_targets.GetUnitTarget()->GetOrientation());
if (targetDest.GetMapId() == unitTarget->GetMapId())
unitTarget->NearTeleportTo(targetDest, unitTarget == m_caster);
else if (unitTarget->GetTypeId() == TYPEID_PLAYER)
unitTarget->ToPlayer()->TeleportTo(targetDest, unitTarget == m_caster ? TELE_TO_SPELL : 0);
else
Player* player = unitTarget->ToPlayer();
if (player)
{
TC_LOG_ERROR("spells", "Spell::EffectTeleportUnits - spellId %u attempted to teleport creature to a different map.", m_spellInfo->Id);
return;
TeleportToOptions options = GetTeleportOptions(m_caster, unitTarget, m_destTargets[effIndex]);
player->TeleportTo(targetDest, options);
}
else if (targetDest.GetMapId() == unitTarget->GetMapId())
unitTarget->NearTeleportTo(targetDest, unitTarget == m_caster);
else
TC_LOG_ERROR("spells", "Spell::EffectTeleportUnits - spellId %u attempted to teleport creature to a different map.", m_spellInfo->Id);
// post effects for TARGET_DEST_DB
/// @todo: awful hacks, move this to spellscripts