aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2022-05-14 20:40:24 +0200
committerShauren <shauren.trinity@gmail.com>2022-05-14 20:40:24 +0200
commit25c0aaa83fede6cd5214da00bb08a21c0b28c4be (patch)
tree2ba5f8d0fa8f162fe2fd50b4b7e7faa89e96bf81 /src/server/scripts
parent19b052d939ade28e95a6aed405a620a6ee966af8 (diff)
Core/Players: Allow teleporting to a specific instance id
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/Commands/cs_group.cpp2
-rw-r--r--src/server/scripts/Commands/cs_misc.cpp4
2 files changed, 3 insertions, 3 deletions
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();
}