Core/AreaTriggers: Teleport to current instance entrance when entering instances via areatrigger entity

Port From (https://github.com/TrinityCore/TrinityCore/commit/4e7508db7b70b2b79ee1fc77a1899d08173ffc62)
2023-09-04 11:40:06 -04:00
parent 296e818f77
commit 3461b6fcaa
3 changed files with 49 additions and 34 deletions
@@ -802,7 +802,15 @@ namespace Game.Entities
                                {
                                    Player player = caster.ToPlayer();
                                    if (player != null)
+                                    {
+                                        if (player.GetMapId() != safeLoc.Loc.GetMapId())
+                                        {
+                                            WorldSafeLocsEntry instanceEntrance = player.GetInstanceEntrance(safeLoc.Loc.GetMapId());
+                                            if (instanceEntrance != null)
+                                                safeLoc = instanceEntrance;
+                                        }
                                        player.TeleportTo(safeLoc.Loc);
+                                    }
                                }
                                break;
                            default: