Core/Misc: Fixed a bunch of uninitialized class fields

2 files changed, 6 insertions, 6 deletions

diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index a60aab6deea..c36c3510919 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -520,6 +520,7 @@ Guild::Member::Member(ObjectGuid::LowType guildId, ObjectGuid guid, GuildRankId
     m_logoutTime(GameTime::GetGameTime()),
     m_accountId(0),
     m_rankId(rankId),
+    m_bankWithdraw(),
     m_bankWithdrawMoney(0),
     m_achievementPoints(0),
     m_totalActivity(0),
@@ -1430,8 +1431,8 @@ void Guild::HandleSetAchievementTracking(WorldSession* session, uint32 const* ac
             }
         }
 
+        GetAchievementMgr().SendAllTrackedCriterias(player, criteriaIds);
         member->SetTrackedCriteriaIds(std::move(criteriaIds));
-        GetAchievementMgr().SendAllTrackedCriterias(player, member->GetTrackedCriteriaIds());
     }
 }
 
diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h
index 071e2c881da..f8aacf775c5 100644
--- a/src/server/game/Guilds/Guild.h
+++ b/src/server/game/Guilds/Guild.h
@@ -352,9 +352,8 @@ class TC_GAME_API Guild
                 uint32 GetTotalReputation() const { return m_totalReputation; }
                 uint32 GetWeekReputation() const { return m_weekReputation; }
 
-                std::set<uint32> const& GetTrackedCriteriaIds() const { return m_trackedCriteriaIds; }
                 void SetTrackedCriteriaIds(std::set<uint32> criteriaIds) { m_trackedCriteriaIds = std::move(criteriaIds); }
-                bool IsTrackingCriteriaId(uint32 criteriaId) const { return m_trackedCriteriaIds.find(criteriaId) != m_trackedCriteriaIds.end();  }
+                bool IsTrackingCriteriaId(uint32 criteriaId) const { return m_trackedCriteriaIds && m_trackedCriteriaIds->contains(criteriaId);  }
 
                 bool IsOnline() const { return (m_flags & GUILDMEMBER_STATUS_ONLINE); }
 
@@ -366,8 +365,8 @@ class TC_GAME_API Guild
 
                 void UpdateBankTabWithdrawValue(CharacterDatabaseTransaction trans, uint8 tabId, uint32 amount);
                 void UpdateBankMoneyWithdrawValue(CharacterDatabaseTransaction trans, uint64 amount);
-                uint32 GetBankTabWithdrawValue(uint8 tabId) const { return m_bankWithdraw[tabId]; };
-                uint64 GetBankMoneyWithdrawValue() const { return m_bankWithdrawMoney; };
+                uint32 GetBankTabWithdrawValue(uint8 tabId) const { return m_bankWithdraw[tabId]; }
+                uint64 GetBankMoneyWithdrawValue() const { return m_bankWithdrawMoney; }
                 void ResetValues(bool weekly = false);
 
                 Player* FindPlayer() const;
@@ -391,7 +390,7 @@ class TC_GAME_API Guild
                 std::string m_publicNote;
                 std::string m_officerNote;
 
-                std::set<uint32> m_trackedCriteriaIds;
+                Optional<std::set<uint32>> m_trackedCriteriaIds;
 
                 std::array<uint32, GUILD_BANK_MAX_TABS> m_bankWithdraw;
                 uint64 m_bankWithdrawMoney;