Conflicts:
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Handlers/GroupHandler.cpp
This commit is contained in:
Shauren committed 2014-10-18 15:54:30 +02:00
commit c238e8faff
17 files changed
+43 -43

No files matched your search

+1 -1
View File
@@ -299,7 +299,7 @@ public:
if (!*args)
return false;
Player* target = sObjectAccessor->FindPlayerByName(args);
Player* target = ObjectAccessor::FindPlayerByName(args);
uint32 targetGuid = 0;
std::string name(args);
+1 -1
View File
@@ -776,7 +776,7 @@ public:
ObjectGuid characterGuid;
uint32 accountId;
Player* player = sObjectAccessor->FindPlayerByName(characterName);
Player* player = ObjectAccessor::FindPlayerByName(characterName);
if (player)
{
characterGuid = player->GetGUID();
+1 -1
View File
@@ -121,7 +121,7 @@ public:
bool footer = false;
boost::shared_lock<boost::shared_mutex> lock(*HashMapHolder<Player>::GetLock());
HashMapHolder<Player>::MapType const& m = sObjectAccessor->GetPlayers();
HashMapHolder<Player>::MapType const& m = ObjectAccessor::GetPlayers();
for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr)
{
AccountTypes itrSec = itr->second->GetSession()->GetSecurity();
+1 -1
View File
@@ -211,7 +211,7 @@ public:
std::string name = strtok(NULL, " ");
if (normalizePlayerName(name))
{
if (Player* player = sObjectAccessor->FindPlayerByName(name))
if (Player* player = ObjectAccessor::FindPlayerByName(name))
{
handler->GetSession()->GetPlayer()->RemoveFromWhisperWhiteList(player->GetGUID());
handler->PSendSysMessage(LANG_COMMAND_WHISPEROFFPLAYER, name.c_str());
+4 -4
View File
@@ -2194,7 +2194,7 @@ public:
if (args && args[0] != '\0')
{
target = sObjectAccessor->FindPlayerByName(args);
target = ObjectAccessor::FindPlayerByName(args);
if (!target)
{
handler->SendSysMessage(LANG_PLAYER_NOT_FOUND);
@@ -2282,7 +2282,7 @@ public:
// find the player
std::string name = arg1;
normalizePlayerName(name);
player = sObjectAccessor->FindPlayerByName(name);
player = ObjectAccessor::FindPlayerByName(name);
// Check if we have duration set
if (arg2 && isNumeric(arg2))
{
@@ -2346,7 +2346,7 @@ public:
{
name = targetName;
normalizePlayerName(name);
player = sObjectAccessor->FindPlayerByName(name);
player = ObjectAccessor::FindPlayerByName(name);
}
else // If no name was entered - use target
{
@@ -2422,7 +2422,7 @@ public:
int32 remaintime = fields[1].GetInt32();
// Save the frozen player to update remaining time in case of future .listfreeze uses
// before the frozen state expires
if (Player* frozen = sObjectAccessor->FindPlayerByName(player))
if (Player* frozen = ObjectAccessor::FindPlayerByName(player))
frozen->SaveToDB();
// Notify the freeze duration
if (remaintime == -1) // Permanent duration
+1 -1
View File
@@ -295,7 +295,7 @@ public:
CharacterDatabase.Execute(stmt);
boost::shared_lock<boost::shared_mutex> lock(*HashMapHolder<Player>::GetLock());
HashMapHolder<Player>::MapType const& plist = sObjectAccessor->GetPlayers();
HashMapHolder<Player>::MapType const& plist = ObjectAccessor::GetPlayers();
for (HashMapHolder<Player>::MapType::const_iterator itr = plist.begin(); itr != plist.end(); ++itr)
itr->second->SetAtLoginFlag(atLogin);
+1 -1
View File
@@ -427,7 +427,7 @@ public:
// Detect target's GUID
ObjectGuid guid;
if (Player* player = sObjectAccessor->FindPlayerByName(name))
if (Player* player = ObjectAccessor::FindPlayerByName(name))
guid = player->GetGUID();
else
guid = sObjectMgr->GetPlayerGUIDByName(name);