Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: fix logic error causing near teleports to drop combat for players

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/f9b14ca795de932746ce404dfe56c5cded3bde2b)
This commit is contained in:
hondacrx
2021-06-23 15:59:06 -04:00
parent abee68a7ee
commit 9d3cd6a6e5
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/SpellEffects.cs
+12 -13
View File
@@ -584,27 +584,26 @@ namespace Game.Spells
} }
// Init dest coordinates // Init dest coordinates
uint mapid = destTarget.GetMapId(); WorldLocation targetDest = new(destTarget);
if (mapid == 0xFFFFFFFF) if (targetDest.GetMapId() == 0xFFFFFFFF)
mapid = unitTarget.GetMapId(); targetDest.SetMapId(unitTarget.GetMapId());
float x, y, z, orientation;
destTarget.GetPosition(out x, out y, out z, out orientation); if (targetDest.GetOrientation() == 0 && m_targets.GetUnitTarget())
if (orientation == 0 && m_targets.GetUnitTarget() != null) targetDest.SetOrientation(m_targets.GetUnitTarget().GetOrientation());
orientation = m_targets.GetUnitTarget().GetOrientation();
Log.outDebug(LogFilter.Spells, "Spell.EffectTeleportUnits - teleport unit to {0} {1} {2} {3} {4}\n", mapid, x, y, z, orientation);
Player player = unitTarget.ToPlayer(); Player player = unitTarget.ToPlayer();
if (player) if (player != null)
{ {
// Custom loading screen // Custom loading screen
uint customLoadingScreenId = (uint)effectInfo.MiscValue; uint customLoadingScreenId = (uint)effectInfo.MiscValue;
if (customLoadingScreenId != 0) if (customLoadingScreenId != 0)
player.SendPacket(new CustomLoadScreen(m_spellInfo.Id, customLoadingScreenId)); player.SendPacket(new CustomLoadScreen(m_spellInfo.Id, customLoadingScreenId));
player.TeleportTo(mapid, x, y, z, orientation, unitTarget == m_caster ? TeleportToOptions.Spell | TeleportToOptions.NotLeaveCombat : 0);
} }
else if (mapid == unitTarget.GetMapId())
unitTarget.NearTeleportTo(x, y, z, orientation, unitTarget == m_caster); if (targetDest.GetMapId() == unitTarget.GetMapId())
unitTarget.NearTeleportTo(targetDest, unitTarget == m_caster);
else if (player != null)
player.TeleportTo(targetDest, unitTarget == m_caster ? TeleportToOptions.Spell : 0);
else else
{ {
Log.outError(LogFilter.Spells, "Spell.EffectTeleportUnits - spellId {0} attempted to teleport creature to a different map.", m_spellInfo.Id); Log.outError(LogFilter.Spells, "Spell.EffectTeleportUnits - spellId {0} attempted to teleport creature to a different map.", m_spellInfo.Id);