aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnHoliver <johnholiver@gmail.com>2011-01-14 16:55:50 -0200
committerclick <per.wilhelmsen@gmail.com>2011-01-14 21:05:02 +0100
commitdb72c4f5612eb44ce39f6818856fbf775d415af6 (patch)
tree27a462c0739cb6f713db3a06e7e36f204427d9cb
parent458c7c642fc57b5ea84dde2a799191945c880c51 (diff)
Core - Modifies a few security checks to take realm id into consideration. It will enable add friends which have moderators (or more) status in other realms and cease undue AH activity logging from those same accounts.
Signed-off-by: click <per.wilhelmsen@gmail.com>
-rw-r--r--src/server/game/AuctionHouse/AuctionHouseMgr.cpp2
-rwxr-xr-xsrc/server/game/Chat/Chat.cpp2
-rwxr-xr-xsrc/server/game/Server/Protocol/Handlers/MiscHandler.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
index 0b23e3745be..8a04b75434c 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -111,7 +111,7 @@ void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry *auction, SQLTransaction&
else
{
bidder_accId = sObjectMgr->GetPlayerAccountIdByGUID(bidder_guid);
- bidder_security = sAccountMgr->GetSecurity(bidder_accId);
+ bidder_security = sAccountMgr->GetSecurity(bidder_accId, realmID);
if (bidder_security > SEC_PLAYER) // not do redundant DB requests
{
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index 30fe5de05a1..fedf1c33f4c 100755
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -529,7 +529,7 @@ bool ChatHandler::HasLowerSecurityAccount(WorldSession* target, uint32 target_ac
if (target)
target_sec = target->GetSecurity();
else if (target_account)
- target_sec = sAccountMgr->GetSecurity(target_account);
+ target_sec = sAccountMgr->GetSecurity(target_account, realmID);
else
return true; // caller must report error for (target == NULL && target_account == 0)
diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
index 73e4f290790..218775e9512 100755
--- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
@@ -587,7 +587,7 @@ void WorldSession::HandleAddFriendOpcodeCallBack(QueryResult result, std::string
team = Player::TeamForRace((*result)[1].GetUInt8());
friendAcctid = (*result)[2].GetUInt32();
- if (GetSecurity() >= SEC_MODERATOR || sWorld->getBoolConfig(CONFIG_ALLOW_GM_FRIEND) || sAccountMgr->GetSecurity(friendAcctid) < SEC_MODERATOR)
+ if (GetSecurity() >= SEC_MODERATOR || sWorld->getBoolConfig(CONFIG_ALLOW_GM_FRIEND) || sAccountMgr->GetSecurity(friendAcctid, realmID) < SEC_MODERATOR)
{
if (friendGuid)
{