Merge branch 'master' of https://github.com/azerothcore/azerothcore-wotlk

5 files changed, 22 insertions, 12 deletions

diff --git a/src/authserver/Main.cpp b/src/authserver/Main.cpp
index e52771f448..8594f301e1 100644
--- a/src/authserver/Main.cpp
+++ b/src/authserver/Main.cpp
@@ -242,21 +242,21 @@ extern int main(int argc, char** argv)
                 CPU_SET(i, &mask);
 
         if (sched_setaffinity(0, sizeof(mask), &mask))
-            sLog->outError("server.authserver", "Can't set used processors (hex): %x, error: %s", affinity, strerror(errno));
+            sLog->outError("Can't set used processors (hex): %x, error: %s", affinity, strerror(errno));
         else
         {
             CPU_ZERO(&mask);
             sched_getaffinity(0, sizeof(mask), &mask);
-            sLog->outString("server.authserver", "Using processors (bitmask, hex): %lx", *(__cpu_mask*)(&mask));
+            sLog->outString("Using processors (bitmask, hex): %lx", *(__cpu_mask*)(&mask));
         }
     }
 
     if (highPriority)
     {
         if (setpriority(PRIO_PROCESS, 0, PROCESS_HIGH_PRIORITY))
-            sLog->outError("server.authserver", "Can't set authserver process priority class, error: %s", strerror(errno));
+            sLog->outError("Can't set authserver process priority class, error: %s", strerror(errno));
         else
-            sLog->outString("server.authserver", "authserver process priority class set to %i", getpriority(PRIO_PROCESS, 0));
+            sLog->outString("authserver process priority class set to %i", getpriority(PRIO_PROCESS, 0));
     }
     
 #endif
diff --git a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
index ec96dc603a..90e861ca2f 100644
--- a/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
+++ b/src/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp
@@ -31,10 +31,20 @@ public:
         switch( pInstance->GetData(DATA_INSTANCE_PROGRESS) )
         {
             case INSTANCE_PROGRESS_INITIAL:
-                gossipTextId = 14688;
-                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1a, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1338);
-                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1b, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1341);
-                break;
+                if(!pPlayer->GetVehicle() )
+				{
+					if (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE)
+						gossipTextId = 15043; //Horde text
+					else
+						gossipTextId = 14757; //Alliance text
+				}
+				else
+				{
+					gossipTextId = 14688;
+					pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1a, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1338);
+					pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT1b, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1341);	
+				}
+				break;
             case INSTANCE_PROGRESS_CHAMPIONS_DEAD:
                 gossipTextId = 14737;
                 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1339);
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 } }
 };