Merge branch 'master' into 4.3.4

Note: What a bad automatic merge!!! needed to fix a lot of stuff... grrr

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Guilds/GuildMgr.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/ChannelHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_titles.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp

2 files changed, 25 insertions, 98 deletions

diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp
index f302009a4f3..67aeda314bf 100644
--- a/src/server/scripts/World/areatrigger_scripts.cpp
+++ b/src/server/scripts/World/areatrigger_scripts.cpp
@@ -235,21 +235,19 @@ enum eWaygate
 
     QUEST_THE_MAKERS_OVERLOOK                   = 12613,
     QUEST_THE_MAKERS_PERCH                      = 12559,
+    QUEST_MEETING_A_GREAT_ONE                   = 13956,
 };
 
 class AreaTrigger_at_sholazar_waygate : public AreaTriggerScript
 {
     public:
 
-        AreaTrigger_at_sholazar_waygate()
-            : AreaTriggerScript("at_sholazar_waygate")
-        {
-        }
+        AreaTrigger_at_sholazar_waygate() : AreaTriggerScript("at_sholazar_waygate") {}
 
         bool OnTrigger(Player* player, AreaTriggerEntry const* trigger)
         {
-            if (player->GetQuestStatus(QUEST_THE_MAKERS_OVERLOOK) == QUEST_STATUS_REWARDED && !player->isDead() &&
-                player->GetQuestStatus(QUEST_THE_MAKERS_PERCH)    == QUEST_STATUS_REWARDED)
+            if (!player->isDead() && (player->GetQuestStatus(QUEST_MEETING_A_GREAT_ONE) != QUEST_STATUS_NONE ||
+                (player->GetQuestStatus(QUEST_THE_MAKERS_OVERLOOK) == QUEST_STATUS_REWARDED && player->GetQuestStatus(QUEST_THE_MAKERS_PERCH) == QUEST_STATUS_REWARDED)))
             {
                 switch (trigger->id)
                 {
@@ -303,76 +301,6 @@ class AreaTrigger_at_nats_landing : public AreaTriggerScript
 };
 
 /*######
-## at_bring_your_orphan_to
-######*/
-
-enum BringYourOrphanTo
-{
-    QUEST_DOWN_AT_THE_DOCKS         = 910,
-    QUEST_GATEWAY_TO_THE_FRONTIER   = 911,
-    QUEST_LORDAERON_THRONE_ROOM     = 1800,
-    QUEST_BOUGHT_OF_ETERNALS        = 1479,
-    QUEST_SPOOKY_LIGHTHOUSE         = 1687,
-    QUEST_STONEWROUGHT_DAM          = 1558,
-    QUEST_DARK_PORTAL_H             = 10951,
-    QUEST_DARK_PORTAL_A             = 10952,
-
-    AT_DOWN_AT_THE_DOCKS            = 3551,
-    AT_GATEWAY_TO_THE_FRONTIER      = 3549,
-    AT_LORDAERON_THRONE_ROOM        = 3547,
-    AT_BOUGHT_OF_ETERNALS           = 3546,
-    AT_SPOOKY_LIGHTHOUSE            = 3552,
-    AT_STONEWROUGHT_DAM             = 3548,
-    AT_DARK_PORTAL                  = 4356,
-
-    AURA_ORPHAN_OUT                 = 58818,
-};
-
-class AreaTrigger_at_bring_your_orphan_to : public AreaTriggerScript
-{
-    public:
-        AreaTrigger_at_bring_your_orphan_to() : AreaTriggerScript("at_bring_your_orphan_to") { }
-
-        bool OnTrigger(Player* player, AreaTriggerEntry const* trigger)
-        {
-            uint32 questId = 0;
-
-            if (player->isDead() || !player->HasAura(AURA_ORPHAN_OUT))
-                return false;
-
-            switch (trigger->id)
-            {
-                case AT_DOWN_AT_THE_DOCKS:
-                    questId = QUEST_DOWN_AT_THE_DOCKS;
-                    break;
-                case AT_GATEWAY_TO_THE_FRONTIER:
-                    questId = QUEST_GATEWAY_TO_THE_FRONTIER;
-                    break;
-                case AT_LORDAERON_THRONE_ROOM:
-                    questId = QUEST_LORDAERON_THRONE_ROOM;
-                    break;
-                case AT_BOUGHT_OF_ETERNALS:
-                    questId = QUEST_BOUGHT_OF_ETERNALS;
-                    break;
-                case AT_SPOOKY_LIGHTHOUSE:
-                    questId = QUEST_SPOOKY_LIGHTHOUSE;
-                    break;
-                case AT_STONEWROUGHT_DAM:
-                    questId = QUEST_STONEWROUGHT_DAM;
-                    break;
-                case AT_DARK_PORTAL:
-                    questId = player->GetTeam() == ALLIANCE ? QUEST_DARK_PORTAL_A : QUEST_DARK_PORTAL_H;
-                    break;
-            }
-
-            if (questId && player->GetQuestStatus(questId) == QUEST_STATUS_INCOMPLETE)
-                player->AreaExploredOrEventHappens(questId);
-
-            return true;
-        }
-};
-
-/*######
 ## at_brewfest
 ######*/
 
@@ -505,7 +433,6 @@ void AddSC_areatrigger_scripts()
     new AreaTrigger_at_last_rites();
     new AreaTrigger_at_sholazar_waygate();
     new AreaTrigger_at_nats_landing();
-    new AreaTrigger_at_bring_your_orphan_to();
     new AreaTrigger_at_brewfest();
     new AreaTrigger_at_area_52_entrance();
 }
diff --git a/src/server/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp
index fb540c177bc..236436b229b 100755
--- a/src/server/scripts/World/chat_log.cpp
+++ b/src/server/scripts/World/chat_log.cpp
@@ -32,25 +32,25 @@ public:
             case CHAT_MSG_ADDON:
                 if (sWorld->getBoolConfig(CONFIG_CHATLOG_ADDON))
                     sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[ADDON] Player %s sends: %s",
-                        player->GetName(), msg.c_str());
+                        player->GetName().c_str(), msg.c_str());
                 break;
 
             case CHAT_MSG_SAY:
                 if (sWorld->getBoolConfig(CONFIG_CHATLOG_PUBLIC))
                     sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[SAY] Player %s says (language %u): %s",
-                        player->GetName(), lang, msg.c_str());
+                        player->GetName().c_str(), lang, msg.c_str());
                 break;
 
             case CHAT_MSG_EMOTE:
                 if (sWorld->getBoolConfig(CONFIG_CHATLOG_PUBLIC))
                     sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[TEXTEMOTE] Player %s emotes: %s",
-                        player->GetName(), msg.c_str());
+                        player->GetName().c_str(), msg.c_str());
                 break;
 
             case CHAT_MSG_YELL:
                 if (sWorld->getBoolConfig(CONFIG_CHATLOG_PUBLIC))
                     sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[YELL] Player %s yells (language %u): %s",
-                        player->GetName(), lang, msg.c_str());
+                        player->GetName().c_str(), lang, msg.c_str());
                 break;
         }
     }
@@ -59,10 +59,10 @@ public:
     {
         if (lang != LANG_ADDON && sWorld->getBoolConfig(CONFIG_CHATLOG_WHISPER))
             sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[WHISPER] Player %s tells %s: %s",
-                player->GetName(), receiver ? receiver->GetName() : "<unknown>", msg.c_str());
+                player->GetName().c_str(), receiver ? receiver->GetName().c_str() : "<unknown>", msg.c_str());
         else if (lang == LANG_ADDON && sWorld->getBoolConfig(CONFIG_CHATLOG_ADDON))
             sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[ADDON] Player %s tells %s: %s",
-                player->GetName(), receiver ? receiver->GetName() : "<unknown>", msg.c_str());
+                player->GetName().c_str(), receiver ? receiver->GetName().c_str() : "<unknown>", msg.c_str());
     }
 
     void OnChat(Player* player, uint32 type, uint32 lang, std::string& msg, Group* group)
@@ -74,52 +74,52 @@ public:
             case CHAT_MSG_PARTY:
                 if (lang != LANG_ADDON && sWorld->getBoolConfig(CONFIG_CHATLOG_PARTY))
                     sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[PARTY] Player %s tells group with leader %s: %s",
-                        player->GetName(), group ? group->GetLeaderName() : "<unknown>", msg.c_str());
+                        player->GetName().c_str(), group ? group->GetLeaderName() : "<unknown>", msg.c_str());
                 else if (lang == LANG_ADDON && sWorld->getBoolConfig(CONFIG_CHATLOG_ADDON))
                     sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[ADDON] Player %s tells group with leader %s: %s",
-                        player->GetName(), group ? group->GetLeaderName() : "<unknown>", msg.c_str());
+                        player->GetName().c_str(), group ? group->GetLeaderName() : "<unknown>", msg.c_str());
                 break;
 
             case CHAT_MSG_PARTY_LEADER:
                 if (sWorld->getBoolConfig(CONFIG_CHATLOG_PARTY))
                     sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[PARTY] Leader %s tells group: %s",
-                        player->GetName(), msg.c_str());
+                        player->GetName().c_str(), msg.c_str());
                 break;
 
             case CHAT_MSG_RAID:
                 if (lang != LANG_ADDON && sWorld->getBoolConfig(CONFIG_CHATLOG_RAID))
                     sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[RAID] Player %s tells raid with leader %s: %s",
-                        player->GetName(), group ? group->GetLeaderName() : "<unknown>", msg.c_str());
+                        player->GetName().c_str(), group ? group->GetLeaderName() : "<unknown>", msg.c_str());
                 else if (lang == LANG_ADDON && sWorld->getBoolConfig(CONFIG_CHATLOG_ADDON))
                     sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[ADDON] Player %s tells raid with leader %s: %s",
-                        player->GetName(), group ? group->GetLeaderName() : "<unknown>", msg.c_str());
+                        player->GetName().c_str(), group ? group->GetLeaderName() : "<unknown>", msg.c_str());
                 break;
 
             case CHAT_MSG_RAID_LEADER:
                 if (sWorld->getBoolConfig(CONFIG_CHATLOG_RAID))
                     sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[RAID] Leader player %s tells raid: %s",
-                        player->GetName(), msg.c_str());
+                        player->GetName().c_str(), msg.c_str());
                 break;
 
             case CHAT_MSG_RAID_WARNING:
                 if (sWorld->getBoolConfig(CONFIG_CHATLOG_RAID))
                     sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[RAID] Leader player %s warns raid with: %s",
-                        player->GetName(), msg.c_str());
+                        player->GetName().c_str(), msg.c_str());
                 break;
 
             case CHAT_MSG_BATTLEGROUND:
                 if (lang != LANG_ADDON && sWorld->getBoolConfig(CONFIG_CHATLOG_BGROUND))
                     sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[BATTLEGROUND] Player %s tells battleground with leader %s: %s",
-                        player->GetName(), group ? group->GetLeaderName() : "<unknown>", msg.c_str());
+                        player->GetName().c_str(), group ? group->GetLeaderName() : "<unknown>", msg.c_str());
                 else if (lang == LANG_ADDON && sWorld->getBoolConfig(CONFIG_CHATLOG_ADDON))
                     sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[ADDON] Player %s tells battleground with leader %s: %s",
-                        player->GetName(), group ? group->GetLeaderName() : "<unknown>", msg.c_str());
+                        player->GetName().c_str(), group ? group->GetLeaderName() : "<unknown>", msg.c_str());
                 break;
 
             case CHAT_MSG_BATTLEGROUND_LEADER:
                 if (sWorld->getBoolConfig(CONFIG_CHATLOG_BGROUND))
                     sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[BATTLEGROUND] Leader player %s tells battleground: %s",
-                        player->GetName(), msg.c_str());
+                        player->GetName().c_str(), msg.c_str());
                 break;
         }
     }
@@ -131,16 +131,16 @@ public:
             case CHAT_MSG_GUILD:
                 if (lang != LANG_ADDON && sWorld->getBoolConfig(CONFIG_CHATLOG_GUILD))
                     sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[GUILD] Player %s tells guild %s: %s",
-                        player->GetName(), guild ? guild->GetName().c_str() : "<unknown>", msg.c_str());
+                        player->GetName().c_str(), guild ? guild->GetName().c_str() : "<unknown>", msg.c_str());
                 else if (lang == LANG_ADDON && sWorld->getBoolConfig(CONFIG_CHATLOG_ADDON))
                     sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[ADDON] Player %s sends to guild %s: %s",
-                        player->GetName(), guild ? guild->GetName().c_str() : "<unknown>", msg.c_str());
+                        player->GetName().c_str(), guild ? guild->GetName().c_str() : "<unknown>", msg.c_str());
                 break;
 
             case CHAT_MSG_OFFICER:
                 if (sWorld->getBoolConfig(CONFIG_CHATLOG_GUILD))
                     sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[OFFICER] Player %s tells guild %s officers: %s",
-                        player->GetName(), guild ? guild->GetName().c_str() : "<unknown>", msg.c_str());
+                        player->GetName().c_str(), guild ? guild->GetName().c_str() : "<unknown>", msg.c_str());
                 break;
         }
     }
@@ -155,10 +155,10 @@ public:
 
         if (sWorld->getBoolConfig(CONFIG_CHATLOG_SYSCHAN) && isSystem)
             sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[SYSCHAN] Player %s tells channel %s: %s",
-                player->GetName(), channel->GetName().c_str(), msg.c_str());
+                player->GetName().c_str(), channel->GetName().c_str(), msg.c_str());
         else if (sWorld->getBoolConfig(CONFIG_CHATLOG_CHANNEL))
             sLog->outDebug(LOG_FILTER_PLAYER_CHATLOG, "[CHANNEL] Player %s tells channel %s: %s",
-                player->GetName(), channel ? channel->GetName().c_str() : "<unknown>", msg.c_str());
+                player->GetName().c_str(), channel ? channel->GetName().c_str() : "<unknown>", msg.c_str());
     }
 };