Part 1: Merge branch 'master' into 4.3.4

6 files changed, 14 insertions, 24 deletions

diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp
index 48724dfe53d..17db09eedfb 100644
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@@ -390,19 +390,6 @@ bool AchievementCriteriaData::Meets(uint32 criteria_id, Player const* source, Un
         }
         case ACHIEVEMENT_CRITERIA_DATA_TYPE_MAP_ID:
             return source->GetMapId() == map_id.mapId;
-        case ACHIEVEMENT_CRITERIA_DATA_TYPE_NTH_BIRTHDAY:
-        {
-            time_t birthday_start = time_t(sWorld->getIntConfig(CONFIG_BIRTHDAY_TIME));
-            tm birthday_tm;
-            localtime_r(&birthday_start, &birthday_tm);
-
-            // exactly N birthday
-            birthday_tm.tm_year += birthday_login.nth_birthday;
-
-            time_t birthday = mktime(&birthday_tm);
-            time_t now = sWorld->GetGameTime();
-            return now <= birthday + DAY && now >= birthday;
-        }
         case ACHIEVEMENT_CRITERIA_DATA_TYPE_S_KNOWN_TITLE:
         {
             if (CharTitlesEntry const* titleInfo = sCharTitlesStore.LookupEntry(known_title.title_id))
diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp
index 4034bd0c1c2..f1436dd90e3 100644
--- a/src/server/game/DataStores/DB2Stores.cpp
+++ b/src/server/game/DataStores/DB2Stores.cpp
@@ -76,9 +76,10 @@ inline void LoadDB2(uint32& availableDb2Locales, DB2StoreProblemList& errlist, D
         // sort problematic db2 to (1) non compatible and (2) nonexistent
         if (FILE* f = fopen(db2_filename.c_str(), "rb"))
         {
-            char buf[100];
-            snprintf(buf, 100,"(exist, but have %d fields instead " SIZEFMTD ") Wrong client version DBC file?", storage.GetFieldCount(), strlen(storage.GetFormat()));
-            errlist.push_back(db2_filename + buf);
+            std::ostringstream stream;
+            stream << db2_filename << " exists, and has " << storage.GetFieldCount() << " field(s) (expected " << strlen(storage.GetFormat()) << "). Extracted file might be from wrong client version.";
+            std::string buf = stream.str();
+            errlist.push_back(buf);
             fclose(f);
         }
         else
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 241bc452706..c4a6e1e473b 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -22498,7 +22498,7 @@ void Player::AddSpellAndCategoryCooldowns(SpellInfo const* spellInfo, uint32 ite
             if (categoryEntry->Flags & SPELL_CATEGORY_FLAG_COOLDOWN_EXPIRES_AT_MIDNIGHT)
             {
                 tm date;
-                ACE_OS::localtime_r(&curTime, &date);
+                localtime_r(&curTime, &date);
                 catrec = catrec * DAY - (date.tm_hour * HOUR + date.tm_min * MINUTE + date.tm_sec) * IN_MILLISECONDS;
             }
         }
diff --git a/src/server/game/Guilds/GuildFinderMgr.h b/src/server/game/Guilds/GuildFinderMgr.h
index 3bf7840b4ec..9fc62d43935 100644
--- a/src/server/game/Guilds/GuildFinderMgr.h
+++ b/src/server/game/Guilds/GuildFinderMgr.h
@@ -18,7 +18,6 @@
 #ifndef __TRINITY_GUILDFINDER_H
 #define __TRINITY_GUILDFINDER_H
 
-#include <ace/Singleton.h>
 #include "Common.h"
 #include "World.h"
 #include "GuildMgr.h"
@@ -188,8 +187,6 @@ typedef std::map<uint32 /* guildGuid */, std::vector<MembershipRequest> > Member
 
 class GuildFinderMgr
 {
-    friend class ACE_Singleton<GuildFinderMgr, ACE_Null_Mutex>;
-
     private:
         GuildFinderMgr();
         ~GuildFinderMgr();
@@ -267,8 +264,14 @@ class GuildFinderMgr
 
         void SendApplicantListUpdate(Guild& guild);
         void SendMembershipRequestListUpdate(Player& player);
+
+        static GuildFinderMgr* instance()
+        {
+            static GuildFinderMgr instance;
+            return &instance;
+        }
 };
 
-#define sGuildFinderMgr ACE_Singleton<GuildFinderMgr, ACE_Null_Mutex>::instance()
+#define sGuildFinderMgr GuildFinderMgr::instance()
 
 #endif // __TRINITY_GUILDFINDER_H
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index 2aa24e10d9d..a46c03ac092 100644
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -270,7 +270,6 @@ void WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
     recvPacket.ReadBit();
     uint32 accountNameLength = recvPacket.ReadBits(12);
     account = recvPacket.ReadString(accountNameLength);
-
     if (sWorld->IsClosed())
     {
         SendAuthResponseError(AUTH_REJECT);
@@ -463,7 +462,7 @@ void WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
 
     _worldSession->LoadGlobalAccountData();
     _worldSession->LoadTutorialsData();
-    _worldSession->ReadAddonsInfo(recvPacket);
+    _worldSession->ReadAddonsInfo(addonsData);
     _worldSession->LoadPermissions();
 
     // At this point, we can safely hook a successful login
diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h
index e46c6b3fe5c..fb0522021d9 100644
--- a/src/server/game/Server/WorldSocket.h
+++ b/src/server/game/Server/WorldSocket.h
@@ -74,7 +74,7 @@ private:
     char _readBuffer[4096];
 
     uint32 _authSeed;
-    AuthCrypt _authCrypt;
+    WorldPacketCrypt _authCrypt;
 
     std::chrono::steady_clock::time_point _LastPingTime;
     uint32 _OverSpeedPings;