diff options
Diffstat (limited to 'src/server/game/Entities/AreaTrigger')
| -rw-r--r-- | src/server/game/Entities/AreaTrigger/AreaTrigger.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp index fb5e3f67e49..82716129e28 100644 --- a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp +++ b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp @@ -842,8 +842,17 @@ void AreaTrigger::DoActions(Unit* unit) case AREATRIGGER_ACTION_TELEPORT: { if (WorldSafeLocsEntry const* safeLoc = sObjectMgr->GetWorldSafeLoc(action.Param)) + { if (Player* player = caster->ToPlayer()) + { + if (player->GetMapId() != safeLoc->Loc.GetMapId()) + { + if (WorldSafeLocsEntry const* instanceEntrance = player->GetInstanceEntrance(safeLoc->Loc.GetMapId())) + safeLoc = instanceEntrance; + } player->TeleportTo(safeLoc->Loc); + } + } break; } default: |