Core/ObjectMgr: Remove GetPlayer function (Remove double use of singletons)
This commit is contained in:
1 parent
fa50c0a464
commit
b2a84d9f1e
47 files changed
+166
-168
No files matched your search
@@ -168,7 +168,7 @@ void Channel::Join(uint64 p, const char *pass)
|
||||
return;
|
||||
}
|
||||
|
||||
Player *plr = sObjectMgr->GetPlayer(p);
|
||||
Player *plr = ObjectAccessor::FindPlayer(p);
|
||||
|
||||
if (plr)
|
||||
{
|
||||
@@ -230,7 +230,7 @@ void Channel::Leave(uint64 p, bool send)
|
||||
}
|
||||
else
|
||||
{
|
||||
Player *plr = sObjectMgr->GetPlayer(p);
|
||||
Player *plr = ObjectAccessor::FindPlayer(p);
|
||||
|
||||
if (send)
|
||||
{
|
||||
@@ -273,7 +273,7 @@ void Channel::Leave(uint64 p, bool send)
|
||||
void Channel::KickOrBan(uint64 good, const char *badname, bool ban)
|
||||
{
|
||||
AccountTypes sec = SEC_PLAYER;
|
||||
Player *gplr = sObjectMgr->GetPlayer(good);
|
||||
Player *gplr = ObjectAccessor::FindPlayer(good);
|
||||
if (gplr)
|
||||
sec = gplr->GetSession()->GetSecurity();
|
||||
|
||||
@@ -291,7 +291,7 @@ void Channel::KickOrBan(uint64 good, const char *badname, bool ban)
|
||||
}
|
||||
else
|
||||
{
|
||||
Player *bad = sObjectMgr->GetPlayer(badname);
|
||||
Player *bad = sObjectAccessor->FindPlayerByName(badname);
|
||||
if (bad == NULL || !IsOn(bad->GetGUID()))
|
||||
{
|
||||
WorldPacket data;
|
||||
@@ -337,7 +337,7 @@ void Channel::KickOrBan(uint64 good, const char *badname, bool ban)
|
||||
void Channel::UnBan(uint64 good, const char *badname)
|
||||
{
|
||||
uint32 sec = 0;
|
||||
Player *gplr = sObjectMgr->GetPlayer(good);
|
||||
Player *gplr = ObjectAccessor::FindPlayer(good);
|
||||
if (gplr)
|
||||
sec = gplr->GetSession()->GetSecurity();
|
||||
|
||||
@@ -355,7 +355,7 @@ void Channel::UnBan(uint64 good, const char *badname)
|
||||
}
|
||||
else
|
||||
{
|
||||
Player *bad = sObjectMgr->GetPlayer(badname);
|
||||
Player *bad = sObjectAccessor->FindPlayerByName(badname);
|
||||
if (bad == NULL || !IsBanned(bad->GetGUID()))
|
||||
{
|
||||
WorldPacket data;
|
||||
@@ -379,7 +379,7 @@ void Channel::Password(uint64 p, const char *pass)
|
||||
{
|
||||
std::string plName;
|
||||
uint32 sec = 0;
|
||||
Player *plr = sObjectMgr->GetPlayer(p);
|
||||
Player *plr = ObjectAccessor::FindPlayer(p);
|
||||
if (plr)
|
||||
sec = plr->GetSession()->GetSecurity();
|
||||
|
||||
@@ -411,7 +411,7 @@ void Channel::Password(uint64 p, const char *pass)
|
||||
|
||||
void Channel::SetMode(uint64 p, const char *p2n, bool mod, bool set)
|
||||
{
|
||||
Player *plr = sObjectMgr->GetPlayer(p);
|
||||
Player *plr = ObjectAccessor::FindPlayer(p);
|
||||
if (!plr)
|
||||
return;
|
||||
|
||||
@@ -431,7 +431,7 @@ void Channel::SetMode(uint64 p, const char *p2n, bool mod, bool set)
|
||||
}
|
||||
else
|
||||
{
|
||||
Player *newp = sObjectMgr->GetPlayer(p2n);
|
||||
Player *newp = sObjectAccessor->FindPlayerByName(p2n);
|
||||
if (!newp)
|
||||
{
|
||||
WorldPacket data;
|
||||
@@ -479,7 +479,7 @@ void Channel::SetMode(uint64 p, const char *p2n, bool mod, bool set)
|
||||
|
||||
void Channel::SetOwner(uint64 p, const char *newname)
|
||||
{
|
||||
Player *plr = sObjectMgr->GetPlayer(p);
|
||||
Player *plr = ObjectAccessor::FindPlayer(p);
|
||||
if (!plr)
|
||||
return;
|
||||
|
||||
@@ -501,7 +501,7 @@ void Channel::SetOwner(uint64 p, const char *newname)
|
||||
return;
|
||||
}
|
||||
|
||||
Player *newp = sObjectMgr->GetPlayer(newname);
|
||||
Player *newp = sObjectAccessor->FindPlayerByName(newname);
|
||||
if (newp == NULL || !IsOn(newp->GetGUID()))
|
||||
{
|
||||
WorldPacket data;
|
||||
@@ -563,7 +563,7 @@ void Channel::List(Player* player)
|
||||
uint32 count = 0;
|
||||
for (PlayerList::const_iterator i = players.begin(); i != players.end(); ++i)
|
||||
{
|
||||
Player *plr = sObjectMgr->GetPlayer(i->first);
|
||||
Player *plr = ObjectAccessor::FindPlayer(i->first);
|
||||
|
||||
// PLAYER can't see MODERATOR, GAME MASTER, ADMINISTRATOR characters
|
||||
// MODERATOR, GAME MASTER, ADMINISTRATOR can see all
|
||||
@@ -585,7 +585,7 @@ void Channel::List(Player* player)
|
||||
void Channel::Announce(uint64 p)
|
||||
{
|
||||
uint32 sec = 0;
|
||||
Player *plr = sObjectMgr->GetPlayer(p);
|
||||
Player *plr = ObjectAccessor::FindPlayer(p);
|
||||
if (plr)
|
||||
sec = plr->GetSession()->GetSecurity();
|
||||
|
||||
@@ -623,7 +623,7 @@ void Channel::Say(uint64 p, const char *what, uint32 lang)
|
||||
if (sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
|
||||
lang = LANG_UNIVERSAL;
|
||||
|
||||
Player *plr = sObjectMgr->GetPlayer(p);
|
||||
Player *plr = ObjectAccessor::FindPlayer(p);
|
||||
|
||||
if (!IsOn(p))
|
||||
{
|
||||
@@ -666,7 +666,7 @@ void Channel::Invite(uint64 p, const char *newname)
|
||||
return;
|
||||
}
|
||||
|
||||
Player *newp = sObjectMgr->GetPlayer(newname);
|
||||
Player *newp = sObjectAccessor->FindPlayerByName(newname);
|
||||
if (!newp)
|
||||
{
|
||||
WorldPacket data;
|
||||
@@ -683,7 +683,7 @@ void Channel::Invite(uint64 p, const char *newname)
|
||||
return;
|
||||
}
|
||||
|
||||
Player *plr = sObjectMgr->GetPlayer(p);
|
||||
Player *plr = ObjectAccessor::FindPlayer(p);
|
||||
if (!plr)
|
||||
return;
|
||||
|
||||
@@ -749,7 +749,7 @@ void Channel::SendToAll(WorldPacket *data, uint64 p)
|
||||
{
|
||||
for (PlayerList::const_iterator i = players.begin(); i != players.end(); ++i)
|
||||
{
|
||||
Player *plr = sObjectMgr->GetPlayer(i->first);
|
||||
Player *plr = ObjectAccessor::FindPlayer(i->first);
|
||||
if (plr)
|
||||
{
|
||||
if (!p || !plr->GetSocial()->HasIgnore(GUID_LOPART(p)))
|
||||
@@ -764,7 +764,7 @@ void Channel::SendToAllButOne(WorldPacket *data, uint64 who)
|
||||
{
|
||||
if (i->first != who)
|
||||
{
|
||||
Player *plr = sObjectMgr->GetPlayer(i->first);
|
||||
Player *plr = ObjectAccessor::FindPlayer(i->first);
|
||||
if (plr)
|
||||
plr->GetSession()->SendPacket(data);
|
||||
}
|
||||
@@ -773,7 +773,7 @@ void Channel::SendToAllButOne(WorldPacket *data, uint64 who)
|
||||
|
||||
void Channel::SendToOne(WorldPacket *data, uint64 who)
|
||||
{
|
||||
Player *plr = sObjectMgr->GetPlayer(who);
|
||||
Player *plr = ObjectAccessor::FindPlayer(who);
|
||||
if (plr)
|
||||
plr->GetSession()->SendPacket(data);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user