From 25c0aaa83fede6cd5214da00bb08a21c0b28c4be Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 14 May 2022 20:40:24 +0200 Subject: Core/Players: Allow teleporting to a specific instance id --- src/server/scripts/Commands/cs_group.cpp | 2 +- src/server/scripts/Commands/cs_misc.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/scripts/Commands') diff --git a/src/server/scripts/Commands/cs_group.cpp b/src/server/scripts/Commands/cs_group.cpp index fdbf40cd42c..36db581a501 100644 --- a/src/server/scripts/Commands/cs_group.cpp +++ b/src/server/scripts/Commands/cs_group.cpp @@ -250,7 +250,7 @@ public: // before GM float x, y, z; gmPlayer->GetClosePoint(x, y, z, player->GetCombatReach()); - player->TeleportTo(gmPlayer->GetMapId(), x, y, z, player->GetOrientation()); + player->TeleportTo(gmPlayer->GetMapId(), x, y, z, player->GetOrientation(), 0, gmPlayer->GetInstanceId()); } return true; diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 1047ea3b826..f944120ee3e 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -454,7 +454,7 @@ public: float x, y, z; target->GetClosePoint(x, y, z, _player->GetCombatReach(), 1.0f); - _player->TeleportTo(target->GetMapId(), x, y, z, _player->GetAbsoluteAngle(target), TELE_TO_GM_MODE); + _player->TeleportTo(target->GetMapId(), x, y, z, _player->GetAbsoluteAngle(target), TELE_TO_GM_MODE, target->GetInstanceId()); PhasingHandler::InheritPhaseShift(_player, target); _player->UpdateObjectVisibility(); } @@ -578,7 +578,7 @@ public: // before GM float x, y, z; _player->GetClosePoint(x, y, z, target->GetCombatReach()); - target->TeleportTo(_player->GetMapId(), x, y, z, target->GetOrientation()); + target->TeleportTo(_player->GetMapId(), x, y, z, target->GetOrientation(), 0, map->GetInstanceId()); PhasingHandler::InheritPhaseShift(target, _player); target->UpdateObjectVisibility(); } -- cgit v1.2.3