diff options
| author | Yehonal <yehonal.azeroth@gmail.com> | 2016-09-24 14:51:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-24 14:51:07 +0200 |
| commit | ca46417a0c33da87e095eb94b0f0a0085c9c1b2f (patch) | |
| tree | 749d32860591a79dd4599eba58b6983e66ab5ce0 /src | |
| parent | 431704c7e2cf6fd351fcc9e25facae97fe7f6d67 (diff) | |
| parent | 438077bc0c27d2022ea97be6ea11d9f64b0917be (diff) | |
Merge pull request #145 from talamortis/master
Instance/Scripts: PoS and HOR fix
Diffstat (limited to 'src')
3 files changed, 4 insertions, 4 deletions
diff --git a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h index 2cf78d335a..6504f7e2b1 100644 --- a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -41,7 +41,7 @@ enum Creatures NPC_SYLVANAS_PART2 = 37554, NPC_DARK_RANGER_LORALEN = 37779, - NPC_ARCHMAGE_ELANDRA = 37774, + NPC_ARCHMAGE_KORELN = 37582, NPC_WAVE_MERCENARY = 38177, NPC_WAVE_FOOTMAN = 38173, diff --git a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 0d46ada33b..f16be1443d 100644 --- a/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -241,7 +241,7 @@ public: creature->SetVisible(false); NPC_GuardGUID = creature->GetGUID(); if (TeamIdInInstance == TEAM_ALLIANCE) - creature->UpdateEntry(NPC_ARCHMAGE_ELANDRA); + creature->UpdateEntry(NPC_ARCHMAGE_KORELN); break; case NPC_UTHER: creature->SetVisible(false); diff --git a/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h b/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h index 9239906a7d..0180e27011 100644 --- a/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h +++ b/src/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h @@ -175,8 +175,8 @@ const ChampionPosition introPositions[] = { { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE }, { 442.526f, 199.361f, 528.84f, 0.0f } }, { { NPC_CHAMPION_2_ALLIANCE, NPC_CHAMPION_3_HORDE }, { 442.843f, 203.193f, 528.84f, 0.0f } }, - { { NPC_LORALEN, NPC_LORALEN }, { 438.505f, 211.54f, 528.71f, 0.0f } }, - { { NPC_LORALEN, NPC_KALIRA }, { 438.946f, 215.427f, 528.71f, 0.0f } }, + { { NPC_LORALEN, NPC_KALIRA }, { 438.505f, 211.54f, 528.71f, 0.0f } }, + { { NPC_KALIRA, NPC_LORALEN }, { 438.946f, 215.427f, 528.71f, 0.0f } }, { { 0, 0 }, { 0.0f, 0.0f, 0.0f, 0.0f } } }; |