araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-13 03:32:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/Players: Fixed crashes happening when player is teleported again while still being teleported to a different map

Browse Source
This commit is contained in:
Shauren
2026-03-05 00:41:37 +01:00
parent 804d80a8e1
commit d6f4f02bec
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/game/Entities/Player/Player.cpp
View File

@@ -1339,6 +1339,9 @@ bool Player::TeleportTo(TeleportLocation const& teleportLocation, TeleportToOpti
}
else
{
if (IsBeingTeleportedFar())
return false;
if (GetClass() == CLASS_DEATH_KNIGHT && GetMapId() == 609 && !IsGameMaster() && !HasSpell(50977))
{
SendTransferAborted(teleportLocation.Location.GetMapId(), TRANSFER_ABORT_UNIQUE_MESSAGE, 1);
@@ -1367,11 +1370,11 @@ bool Player::TeleportTo(TeleportLocation const& teleportLocation, TeleportToOpti
SetSemaphoreTeleportNear(false);
//setup delayed teleport flag
SetDelayedTeleportFlag(IsCanDelayTeleport());
SetSemaphoreTeleportFar(true);
//if teleport spell is cast in Unit::Update() func
//then we need to delay it until update process will be finished
if (IsHasDelayedTeleport())
{
SetSemaphoreTeleportFar(true);
//lets save teleport destination for player
m_teleport_dest = teleportLocation;
m_teleport_options = options;