diff options
-rw-r--r-- | sql/updates/10548_characters_channel.sql | 3 | ||||
-rwxr-xr-x | src/server/game/Chat/Channels/Channel.cpp | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/sql/updates/10548_characters_channel.sql b/sql/updates/10548_characters_channel.sql index 905d3583e4a..126a51ca5bb 100644 --- a/sql/updates/10548_characters_channel.sql +++ b/sql/updates/10548_characters_channel.sql @@ -5,4 +5,5 @@ CHANGE `m_announce` `m_announce` TINYINT(3) UNSIGNED DEFAULT '1' NOT NULL, CHANGE `m_public` `m_ownership` TINYINT(3) UNSIGNED DEFAULT '1' NOT NULL, CHANGE `m_password` `m_password` VARCHAR(32) NULL, ADD COLUMN `last_used` INT(10) UNSIGNED NOT NULL AFTER `BannedList`; -SET last_used = UNIX_TIMESTAMP(); +-- Set already existing/current channels to use current timestamp (saves them from being unneccesarily cleaned up) +UPDATE `channels` SET last_used = UNIX_TIMESTAMP(); diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp index 9a5e42ef6c0..30f9f95adfc 100755 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -641,12 +641,6 @@ void Channel::Say(uint64 p, const char *what, uint32 lang) MakeMuted(&data); SendToOne(&data, p); } - else if (!players[p].IsModerator() && sec < SEC_GAMEMASTER) - { - WorldPacket data; - MakeNotModerator(&data); - SendToOne(&data, p); - } else { uint32 messageLength = strlen(what) + 1; |