From f5f3360e01122cb4aafdb3c3696e68f49fc2e81c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francesco=20Borz=C3=AC?= <borzifrancesco@gmail.com>
Date: Mon, 14 Dec 2020 20:45:43 +0100
Subject: [PATCH] refactor(Core/Social): Cleanup (#3843)

---
 src/server/game/Entities/Player/SocialMgr.cpp | 7 ++-----
 src/server/game/Handlers/Socialhandler.cpp    | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/server/game/Entities/Player/SocialMgr.cpp b/src/server/game/Entities/Player/SocialMgr.cpp
index bd03d687b..bc21ac36c 100644
--- a/src/server/game/Entities/Player/SocialMgr.cpp
+++ b/src/server/game/Entities/Player/SocialMgr.cpp
@@ -315,16 +315,13 @@ PlayerSocial* SocialMgr::LoadFromDB(PreparedQueryResult result, uint64 guid)
     if (!result)
         return social;
 
-    uint8 flags = 0;
-    std::string note = "";
-
     do
     {
         Field* fields = result->Fetch();
 
         auto friendGuid = fields[0].GetUInt32();
-        flags = fields[1].GetUInt8();
-        note = fields[2].GetString();
+        auto flags = fields[1].GetUInt8();
+        auto note = fields[2].GetString();
 
         social->m_playerSocialMap[friendGuid] = FriendInfo(flags, note);
     } while (result->NextRow());
diff --git a/src/server/game/Handlers/Socialhandler.cpp b/src/server/game/Handlers/Socialhandler.cpp
index 9c81ec16f..03ede8c35 100644
--- a/src/server/game/Handlers/Socialhandler.cpp
+++ b/src/server/game/Handlers/Socialhandler.cpp
@@ -113,7 +113,7 @@ void WorldSession::HandleAddIgnoreOpcode(WorldPacket& recv_data)
         return;
 
     uint64 IgnoreGuid = MAKE_NEW_GUID(lowGuid, 0, HIGHGUID_PLAYER);
-    FriendsResult ignoreResult = FRIEND_IGNORE_NOT_FOUND;
+    FriendsResult ignoreResult;
 
     if (IgnoreGuid == GetPlayer()->GetGUID())              //not add yourself
         ignoreResult = FRIEND_IGNORE_SELF;