aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Groups
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Groups')
-rwxr-xr-xsrc/server/game/Groups/Group.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 87002e4086c..6cebc9cc560 100755
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -217,7 +217,7 @@ void Group::ConvertToRaid()
// update quest related GO states (quest activity dependent from raid membership)
for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
- if (Player* player = sObjectMgr->GetPlayer(citr->guid))
+ if (Player* player = ObjectAccessor::FindPlayer(citr->guid))
player->UpdateForQuestWorldObjects();
}
@@ -400,7 +400,7 @@ bool Group::RemoveMember(const uint64 &guid, const RemoveMethod &method /*= GROU
// remove member and change leader (if need) only if strong more 2 members _before_ member remove (BG allow 1 member group)
if (GetMembersCount() > (isBGGroup() ? 1u : 2u))
{
- Player* player = sObjectMgr->GetPlayer(guid);
+ Player* player = ObjectAccessor::FindPlayer(guid);
if (player)
{
// Battleground group handling
@@ -478,7 +478,7 @@ bool Group::RemoveMember(const uint64 &guid, const RemoveMethod &method /*= GROU
{
for (member_witerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr)
{
- if (sObjectMgr->GetPlayer(itr->guid))
+ if (ObjectAccessor::FindPlayer(itr->guid))
{
ChangeLeader(itr->guid);
break;
@@ -505,7 +505,7 @@ void Group::ChangeLeader(const uint64 &guid)
if (slot == m_memberSlots.end())
return;
- Player* player = sObjectMgr->GetPlayer(slot->guid);
+ Player* player = ObjectAccessor::FindPlayer(slot->guid);
// Don't allow switching leader to offline players
if (!player)
@@ -557,7 +557,7 @@ void Group::Disband(bool hideDestroy /* = false */)
Player* player;
for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
{
- player = sObjectMgr->GetPlayer(citr->guid);
+ player = ObjectAccessor::FindPlayer(citr->guid);
if (!player)
continue;
@@ -643,7 +643,7 @@ void Group::SendLootStartRoll(uint32 CountDown, uint32 mapid, const Roll &r)
for (Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr != r.playerVote.end(); ++itr)
{
- Player *p = sObjectMgr->GetPlayer(itr->first);
+ Player *p = ObjectAccessor::FindPlayer(itr->first);
if (!p || !p->GetSession())
continue;
@@ -667,7 +667,7 @@ void Group::SendLootRoll(const uint64& SourceGuid, const uint64& TargetGuid, uin
for (Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr != r.playerVote.end(); ++itr)
{
- Player *p = sObjectMgr->GetPlayer(itr->first);
+ Player *p = ObjectAccessor::FindPlayer(itr->first);
if (!p || !p->GetSession())
continue;
@@ -690,7 +690,7 @@ void Group::SendLootRollWon(const uint64& SourceGuid, const uint64& TargetGuid,
for (Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr != r.playerVote.end(); ++itr)
{
- Player *p = sObjectMgr->GetPlayer(itr->first);
+ Player *p = ObjectAccessor::FindPlayer(itr->first);
if (!p || !p->GetSession())
continue;
@@ -710,7 +710,7 @@ void Group::SendLootAllPassed(uint32 NumberOfPlayers, const Roll &r)
for (Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr != r.playerVote.end(); ++itr)
{
- Player *p = sObjectMgr->GetPlayer(itr->first);
+ Player *p = ObjectAccessor::FindPlayer(itr->first);
if (!p || !p->GetSession())
continue;
@@ -799,7 +799,7 @@ void Group::GroupLoot(Loot *loot, WorldObject* pLootedObject)
{
for (Roll::PlayerVote::const_iterator itr=r->playerVote.begin(); itr != r->playerVote.end(); ++itr)
{
- Player *p = sObjectMgr->GetPlayer(itr->first);
+ Player *p = ObjectAccessor::FindPlayer(itr->first);
if (!p || !p->GetSession())
continue;
@@ -890,7 +890,7 @@ void Group::NeedBeforeGreed(Loot *loot, WorldObject* pLootedObject)
{
for (Roll::PlayerVote::const_iterator itr=r->playerVote.begin(); itr != r->playerVote.end(); ++itr)
{
- Player *p = sObjectMgr->GetPlayer(itr->first);
+ Player *p = ObjectAccessor::FindPlayer(itr->first);
if (!p || !p->GetSession())
continue;
@@ -1040,7 +1040,7 @@ void Group::CountTheRoll(Rolls::iterator rollI, uint32 NumberOfPlayers)
}
}
SendLootRollWon(0, maxguid, maxresul, ROLL_NEED, *roll);
- player = sObjectMgr->GetPlayer(maxguid);
+ player = ObjectAccessor::FindPlayer(maxguid);
if (player && player->GetSession())
{
@@ -1090,7 +1090,7 @@ void Group::CountTheRoll(Rolls::iterator rollI, uint32 NumberOfPlayers)
}
}
SendLootRollWon(0, maxguid, maxresul, rollvote, *roll);
- player = sObjectMgr->GetPlayer(maxguid);
+ player = ObjectAccessor::FindPlayer(maxguid);
if (player && player->GetSession())
{
@@ -1187,7 +1187,7 @@ void Group::SendUpdate()
Player* player;
for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
{
- player = sObjectMgr->GetPlayer(citr->guid);
+ player = ObjectAccessor::FindPlayer(citr->guid);
if (!player || !player->GetSession() || player->GetGroup() != this)
continue;
@@ -1210,7 +1210,7 @@ void Group::SendUpdate()
if (citr->guid == citr2->guid)
continue;
- Player* member = sObjectMgr->GetPlayer(citr2->guid);
+ Player* member = ObjectAccessor::FindPlayer(citr2->guid);
uint8 onlineState = (member) ? MEMBER_STATUS_ONLINE : MEMBER_STATUS_OFFLINE;
onlineState = onlineState | ((isBGGroup()) ? MEMBER_STATUS_PVP : 0);
@@ -1284,7 +1284,7 @@ void Group::OfflineReadyCheck()
{
for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
{
- Player *pl = sObjectMgr->GetPlayer(citr->guid);
+ Player *pl = ObjectAccessor::FindPlayer(citr->guid);
if (!pl || !pl->GetSession())
{
WorldPacket data(MSG_RAID_READY_CHECK_CONFIRM, 9);
@@ -1351,7 +1351,7 @@ void Group::ChangeMembersGroup(const uint64 &guid, const uint8 &group)
if (!isBGGroup())
CharacterDatabase.PExecute("UPDATE group_member SET subgroup='%u' WHERE memberGuid='%u'", group, GUID_LOPART(guid));
- Player* player = sObjectMgr->GetPlayer(guid);
+ Player* player = ObjectAccessor::FindPlayer(guid);
// In case the moved player is online, update the player object with the new sub group references
if (player)
@@ -1740,7 +1740,7 @@ void Group::BroadcastGroupUpdate(void)
for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
{
- Player *pp = sObjectMgr->GetPlayer(citr->guid);
+ Player *pp = ObjectAccessor::FindPlayer(citr->guid);
if (pp && pp->IsInWorld())
{
pp->ForceValuesUpdateAtIndex(UNIT_FIELD_BYTES_2);
@@ -1756,7 +1756,7 @@ void Group::ResetMaxEnchantingLevel()
Player *pMember = NULL;
for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
{
- pMember = sObjectMgr->GetPlayer(citr->guid);
+ pMember = ObjectAccessor::FindPlayer(citr->guid);
if (pMember && m_maxEnchantingLevel < pMember->GetSkillValue(SKILL_ENCHANTING))
m_maxEnchantingLevel = pMember->GetSkillValue(SKILL_ENCHANTING);
}