Core/Players: Allow teleporting to a specific instance id
Port From (https://github.com/TrinityCore/TrinityCore/commit/25c0aaa83fede6cd5214da00bb08a21c0b28c4be)
This commit is contained in:
@@ -427,7 +427,7 @@ namespace Game.Chat
|
||||
// before GM
|
||||
float x, y, z;
|
||||
gmPlayer.GetClosePoint(out x, out y, out 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;
|
||||
|
||||
@@ -140,7 +140,7 @@ namespace Game.Chat
|
||||
float x, y, z;
|
||||
target.GetClosePoint(out x, out y, out z, _player.GetCombatReach(), 1.0f);
|
||||
|
||||
_player.TeleportTo(target.GetMapId(), x, y, z, _player.GetAbsoluteAngle(target), TeleportToOptions.GMMode);
|
||||
_player.TeleportTo(target.GetMapId(), x, y, z, _player.GetAbsoluteAngle(target), TeleportToOptions.GMMode, target.GetInstanceId());
|
||||
PhasingHandler.InheritPhaseShift(_player, target);
|
||||
_player.UpdateObjectVisibility();
|
||||
}
|
||||
@@ -1856,7 +1856,7 @@ namespace Game.Chat
|
||||
// before GM
|
||||
float x, y, z;
|
||||
_player.GetClosePoint(out x, out y, out 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();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user