API tools faq
paste
Dinoza

Lfg

Dinoza
Jan 27th, 2012
294
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
C++ 8.19 KB | None | 0 0
raw download clone embed print report
  1. diff -r ede7be8570ec -r ad1a449d5bd8 src/server/game/Chat/Channels/Channel.cpp
  2. --- a/src/server/game/Chat/Channels/Channel.cpp Mon Jan 02 20:39:22 2012 +0200
  3. +++ b/src/server/game/Chat/Channels/Channel.cpp Mon Jan 02 20:52:57 2012 +0200
  4. @@ -172,17 +172,7 @@
  5.      Player* player = ObjectAccessor::FindPlayer(p);
  6.  
  7.      if (player)
  8. -    {
  9. -        if (HasFlag(CHANNEL_FLAG_LFG) &&
  10. -            sWorld->getBoolConfig(CONFIG_RESTRICTED_LFG_CHANNEL) && AccountMgr::IsPlayerAccount(player->GetSession()->GetSecurity()) && player->GetGroup())
  11. -        {
  12. -            MakeNotInLfg(&data);
  13. -            SendToOne(&data, p);
  14. -            return;
  15. -        }
  16. -
  17.          player->JoinedChannel(this);
  18. -    }
  19.  
  20.      if (m_announce && (!player || !AccountMgr::IsGMAccount(player->GetSession()->GetSecurity()) || !sWorld->getBoolConfig(CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL)))
  21.      {
  22. diff -r ede7be8570ec -r ad1a449d5bd8 src/server/game/Entities/Player/Player.cpp
  23. --- a/src/server/game/Entities/Player/Player.cpp    Mon Jan 02 20:39:22 2012 +0200
  24. +++ b/src/server/game/Entities/Player/Player.cpp    Mon Jan 02 20:52:57 2012 +0200
  25. @@ -5532,20 +5532,6 @@
  26.          TeleportTo(m_homebindMapId, m_homebindX, m_homebindY, m_homebindZ, GetOrientation());
  27.  }
  28.  
  29. -bool Player::CanJoinConstantChannelInZone(ChatChannelsEntry const* channel, AreaTableEntry const* zone)
  30. -{
  31. -    if (channel->flags & CHANNEL_DBC_FLAG_ZONE_DEP && zone->flags & AREA_FLAG_ARENA_INSTANCE)
  32. -        return false;
  33. -
  34. -    if ((channel->flags & CHANNEL_DBC_FLAG_CITY_ONLY) && (!(zone->flags & AREA_FLAG_SLAVE_CAPITAL)))
  35. -        return false;
  36. -
  37. -    if ((channel->flags & CHANNEL_DBC_FLAG_GUILD_REQ) && GetGuildId())
  38. -        return false;
  39. -
  40. -    return true;
  41. -}
  42. -
  43.  void Player::JoinedChannel(Channel* c)
  44.  {
  45.      m_channels.push_back(c);
  46. @@ -5603,40 +5589,35 @@
  47.              Channel* joinChannel = NULL;
  48.              bool sendRemove = true;
  49.  
  50. -            if (CanJoinConstantChannelInZone(channel, current_zone))
  51. -            {
  52. -                if (!(channel->flags & CHANNEL_DBC_FLAG_GLOBAL))
  53. -                {
  54. -                    if (channel->flags & CHANNEL_DBC_FLAG_CITY_ONLY && usedChannel)
  55. -                        continue;                            // Already on the channel, as city channel names are not changing
  56. -
  57. -                    char new_channel_name_buf[100];
  58. -                    char const* currentNameExt;
  59. -
  60. -                    if (channel->flags & CHANNEL_DBC_FLAG_CITY_ONLY)
  61. -                        currentNameExt = sObjectMgr->GetTrinityStringForDBCLocale(LANG_CHANNEL_CITY);
  62. +            if (!(channel->flags & CHANNEL_DBC_FLAG_GLOBAL))
  63. +            {
  64. +                if (channel->flags & CHANNEL_DBC_FLAG_CITY_ONLY && usedChannel)
  65. +                    continue;                            // Already on the channel, as city channel names are not changing
  66. +
  67. +                char new_channel_name_buf[100];
  68. +                char const* currentNameExt;
  69. +
  70. +                if (channel->flags & CHANNEL_DBC_FLAG_CITY_ONLY)
  71. +                    currentNameExt = sObjectMgr->GetTrinityStringForDBCLocale(LANG_CHANNEL_CITY);
  72. +                else
  73. +                    currentNameExt = current_zone_name.c_str();
  74. +
  75. +                snprintf(new_channel_name_buf, 100, channel->pattern[m_session->GetSessionDbcLocale()], currentNameExt);
  76. +
  77. +                joinChannel = cMgr->GetJoinChannel(new_channel_name_buf, channel->ChannelID);
  78. +                if (usedChannel)
  79. +                {
  80. +                    if (joinChannel != usedChannel)
  81. +                    {
  82. +                        removeChannel = usedChannel;
  83. +                        sendRemove = false;              // Do not send leave channel, it already replaced at client
  84. +                    }
  85.                      else
  86. -                        currentNameExt = current_zone_name.c_str();
  87. -
  88. -                    snprintf(new_channel_name_buf, 100, channel->pattern[m_session->GetSessionDbcLocale()], currentNameExt);
  89. -
  90. -                    joinChannel = cMgr->GetJoinChannel(new_channel_name_buf, channel->ChannelID);
  91. -                    if (usedChannel)
  92. -                    {
  93. -                        if (joinChannel != usedChannel)
  94. -                        {
  95. -                            removeChannel = usedChannel;
  96. -                            sendRemove = false;              // Do not send leave channel, it already replaced at client
  97. -                        }
  98. -                        else
  99. -                            joinChannel = NULL;
  100. -                    }
  101. -                }
  102. -                else
  103. -                    joinChannel = cMgr->GetJoinChannel(channel->pattern[m_session->GetSessionDbcLocale()], channel->ChannelID);
  104. -            }
  105. -            else
  106. -                removeChannel = usedChannel;
  107. +                        joinChannel = NULL;
  108. +                }
  109. +            }
  110. +            else
  111. +                joinChannel = cMgr->GetJoinChannel(channel->pattern[m_session->GetSessionDbcLocale()], channel->ChannelID);
  112.  
  113.              if (joinChannel)
  114.                  joinChannel->Join(GetGUID(), "");            // Changed Channel: ... or Joined Channel: ...
  115. diff -r ede7be8570ec -r ad1a449d5bd8 src/server/game/Entities/Player/Player.h
  116. --- a/src/server/game/Entities/Player/Player.h  Mon Jan 02 20:39:22 2012 +0200
  117. +++ b/src/server/game/Entities/Player/Player.h  Mon Jan 02 20:52:57 2012 +0200
  118. @@ -1985,8 +1985,6 @@
  119.  
  120.          void SetMovement(PlayerMovementType pType);
  121.  
  122. -        bool CanJoinConstantChannelInZone(ChatChannelsEntry const* channel, AreaTableEntry const* zone);
  123. -
  124.          void JoinedChannel(Channel* c);
  125.          void LeftChannel(Channel* c);
  126.          void CleanupChannels();
  127. diff -r ede7be8570ec -r ad1a449d5bd8 src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp
  128. --- a/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp   Mon Jan 02 20:39:22 2012 +0200
  129. +++ b/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp   Mon Jan 02 20:52:57 2012 +0200
  130. @@ -41,9 +41,6 @@
  131.          AreaTableEntry const* current_zone = GetAreaEntryByAreaID(_player->GetZoneId());
  132.          if (!current_zone)
  133.              return;
  134. -
  135. -        if (!_player->CanJoinConstantChannelInZone(channel, current_zone))
  136. -            return;
  137.      }
  138.  
  139.      if (channelname.empty())
  140. diff -r ede7be8570ec -r ad1a449d5bd8 src/server/game/World/World.cpp
  141. --- a/src/server/game/World/World.cpp   Mon Jan 02 20:39:22 2012 +0200
  142. +++ b/src/server/game/World/World.cpp   Mon Jan 02 20:52:57 2012 +0200
  143. @@ -976,7 +976,6 @@
  144.  
  145.      m_bool_configs[CONFIG_DETECT_POS_COLLISION] = ConfigMgr::GetBoolDefault("DetectPosCollision", true);
  146.  
  147. -    m_bool_configs[CONFIG_RESTRICTED_LFG_CHANNEL]      = ConfigMgr::GetBoolDefault("Channel.RestrictedLfg", true);
  148.      m_bool_configs[CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL] = ConfigMgr::GetBoolDefault("Channel.SilentlyGMJoin", false);
  149.  
  150.      m_bool_configs[CONFIG_TALENTS_INSPECTING]           = ConfigMgr::GetBoolDefault("TalentsInspecting", true);
  151. diff -r ede7be8570ec -r ad1a449d5bd8 src/server/game/World/World.h
  152. --- a/src/server/game/World/World.h Mon Jan 02 20:39:22 2012 +0200
  153. +++ b/src/server/game/World/World.h Mon Jan 02 20:52:57 2012 +0200
  154. @@ -115,7 +115,6 @@
  155.      CONFIG_ALWAYS_MAX_SKILL_FOR_LEVEL,
  156.      CONFIG_QUEST_IGNORE_RAID,
  157.      CONFIG_DETECT_POS_COLLISION,
  158. -    CONFIG_RESTRICTED_LFG_CHANNEL,
  159.      CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL,
  160.      CONFIG_TALENTS_INSPECTING,
  161.      CONFIG_CHAT_FAKE_MESSAGE_PREVENTING,
  162. diff -r ede7be8570ec -r ad1a449d5bd8 src/server/worldserver/worldserver.conf.dist
  163. --- a/src/server/worldserver/worldserver.conf.dist  Mon Jan 02 20:39:22 2012 +0200
  164. +++ b/src/server/worldserver/worldserver.conf.dist  Mon Jan 02 20:52:57 2012 +0200
  165. @@ -1727,14 +1727,6 @@
  166.  ChatFlood.MuteTime = 10
  167.  
  168.  #
  169. -#    Channel.RestrictedLfg
  170. -#        Description: Restrict LookupForGroup channel to characters registered in the LFG tool.
  171. -#        Default:     1 - (Enabled, Allow join to channel only if registered in LFG)
  172. -#                     0 - (Disabled, Allow join to channel in any time)
  173. -
  174. -Channel.RestrictedLfg = 1
  175. -
  176. -#
  177.  #    Channel.SilentlyGMJoin
  178.  #        Description: Silently join GM characters to channels. If set to 1, channel kick and ban
  179.  #                     commands issued by a GM will not be broadcasted.
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!