Merge branch 'azerothcore:master' into Playerbot

2026-01-26 15:16:24 +00:00 · 2023-04-19 09:48:45 -06:00
parent e622ba991f d4a2b08437
commit 780c8ede85
33 changed files with 353 additions and 17 deletions
--- a/src/server/game/Entities/Player/PlayerUpdates.cpp
+++ b/src/server/game/Entities/Player/PlayerUpdates.cpp
@@ -491,12 +491,11 @@ void Player::UpdateLocalChannels(uint32 newZone)
        {
            Channel* usedChannel = nullptr;

-            for (JoinedChannelsList::iterator itr = m_channels.begin();
-                 itr != m_channels.end(); ++itr)
+            for (Channel* channel : m_channels)
            {
-                if ((*itr)->GetChannelId() == i)
+                if (channel && channel->GetChannelId() == i)
                {
-                    usedChannel = *itr;
+                    usedChannel = channel;
                    break;
                }
            }