Core/Groups: Use iterators instead of raw LinkedListElement to interact with group members

2 files changed, 9 insertions, 7 deletions

diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
index 920d2f1d0b2..43bd93489d4 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
@@ -67,10 +67,10 @@ class go_gauntlet_gate : public GameObjectScript
 
                 if (Group* group = player->GetGroup())
                 {
-                    for (GroupReference* itr = group->GetFirstMember(); itr != nullptr; itr = itr->next())
+                    for (GroupReference const& itr : group->GetMembers())
                     {
-                        Player* pGroupie = itr->GetSource();
-                        if (!pGroupie || !pGroupie->IsInMap(player))
+                        Player* pGroupie = itr.GetSource();
+                        if (!pGroupie->IsInMap(player))
                             continue;
 
                         if (pGroupie->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE &&
diff --git a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
index 06098172780..e369cef4dac 100644
--- a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
@@ -44,10 +44,12 @@ class spell_razelikh_teleport_group : public SpellScript
         {
             if (Group* group = player->GetGroup())
             {
-                for (GroupReference* itr = group->GetFirstMember(); itr != nullptr; itr = itr->next())
-                    if (Player* member = itr->GetSource())
-                        if (member->IsWithinDistInMap(player, 20.0f) && !member->isDead())
-                            member->CastSpell(member, SPELL_TELEPORT_SINGLE_IN_GROUP, true);
+                for (GroupReference const& itr : group->GetMembers())
+                {
+                    Player* member = itr.GetSource();
+                    if (member->IsWithinDistInMap(player, 20.0f) && !member->isDead())
+                        member->CastSpell(member, SPELL_TELEPORT_SINGLE_IN_GROUP, true);
+                }
             }
             else
                 player->CastSpell(player, SPELL_TELEPORT_SINGLE, true);