Core/Chat: Rewrite some custom channel handling. Channel creation now properly saves passwords. Closes #23589.

(cherry picked from commit 8c16f318fe072709fc40c61987570dba8f5b6483)

1 files changed, 17 insertions, 2 deletions

diff --git a/src/server/game/Handlers/ChannelHandler.cpp b/src/server/game/Handlers/ChannelHandler.cpp
index b85eb83eefc..9cd28f709b5 100644
--- a/src/server/game/Handlers/ChannelHandler.cpp
+++ b/src/server/game/Handlers/ChannelHandler.cpp
@@ -58,8 +58,23 @@ void WorldSession::HandleJoinChannel(WorldPackets::Channel::JoinChannel& packet)
         return;
 
     if (ChannelMgr* cMgr = ChannelMgr::ForTeam(GetPlayer()->GetTeam()))
-        if (Channel* channel = cMgr->GetJoinChannel(packet.ChatChannelId, packet.ChannelName, zone))
-            channel->JoinChannel(GetPlayer(), packet.Password);
+    {
+        if (packet.ChatChannelId)
+        { // system channel
+            if (Channel* channel = cMgr->GetSystemChannel(packet.ChatChannelId, zone))
+                channel->JoinChannel(GetPlayer());
+        }
+        else
+        { // custom channel
+            if (Channel* channel = cMgr->GetCustomChannel(packet.ChannelName))
+                channel->JoinChannel(GetPlayer(), packet.Password);
+            else if (Channel* channel = cMgr->CreateCustomChannel(packet.ChannelName))
+            {
+                channel->SetPassword(packet.Password);
+                channel->JoinChannel(GetPlayer(), packet.Password);
+            }
+        }
+    }
 }
 
 void WorldSession::HandleLeaveChannel(WorldPackets::Channel::LeaveChannel& packet)