diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2019-07-13 17:44:41 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-16 00:37:01 +0100 |
| commit | ea753efb9370455979c8af8ebaafa734b77d6052 (patch) | |
| tree | f34607eef7b093e44510dca18b441146a52e58e3 /src/server/game/Entities/Player | |
| parent | 71b2f8c6ab26ef7683100fdf288813e87f6bbf73 (diff) | |
Core/Chat: Rewrite some custom channel handling. Channel creation now properly saves passwords. Closes #23589.
(cherry picked from commit 8c16f318fe072709fc40c61987570dba8f5b6483)
Diffstat (limited to 'src/server/game/Entities/Player')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index ad525d51145..e8ae4bbdd49 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -4889,7 +4889,7 @@ void Player::UpdateLocalChannels(uint32 newZone) if (channelEntry->Flags & CHANNEL_DBC_FLAG_CITY_ONLY && usedChannel) continue; // Already on the channel, as city channel names are not changing - joinChannel = cMgr->GetJoinChannel(channelEntry->ID, std::string(), current_zone); + joinChannel = cMgr->GetSystemChannel(channelEntry->ID, current_zone); if (usedChannel) { if (joinChannel != usedChannel) @@ -4902,13 +4902,13 @@ void Player::UpdateLocalChannels(uint32 newZone) } } else - joinChannel = cMgr->GetJoinChannel(channelEntry->ID, std::string()); + joinChannel = cMgr->GetSystemChannel(channelEntry->ID); } else removeChannel = usedChannel; if (joinChannel) - joinChannel->JoinChannel(this, ""); // Changed Channel: ... or Joined Channel: ... + joinChannel->JoinChannel(this); // Changed Channel: ... or Joined Channel: ... if (removeChannel) { |