From 268608d9b9bc1ee8460c0180c97de0178e6a8b29 Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Tue, 21 Oct 2014 23:53:13 -0400 Subject: [PATCH] Bot no longer messages non-logging channels on modrequest; bot no longer messages itself on modrequest. --- Release/Plugins/RenX.Core.lib | Bin 58474 -> 58474 bytes RenX.Commands/RenX_Commands.cpp | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index 2c99aef59989c5bb7a6554b95e4a1575b93081ec..8e333baf0c22f25e6a6013f96161410650ec3ac1 100644 GIT binary patch delta 3329 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 diff --git a/RenX.Commands/RenX_Commands.cpp b/RenX.Commands/RenX_Commands.cpp index ede2cf3..d10bae9 100644 --- a/RenX.Commands/RenX_Commands.cpp +++ b/RenX.Commands/RenX_Commands.cpp @@ -1377,13 +1377,13 @@ void ModRequestGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *play if (channel != nullptr) { type = channel->getType(); - server->sendMessage(channel->getName(), msg2); if (source->isLogChanType(type)) { + server->sendMessage(channel->getName(), msg2); msg += channel->getName(); for (unsigned int c = 0; c < channel->getUserCount(); c++) { - if (channel->getUserPrefix(c) != 0) + if (channel->getUserPrefix(c) != 0 && channel->getUser(c)->getNickname().equals(server->getNickname()) == false) { server->sendMessage(channel->getUser(c)->getUser()->getNickname(), msg); messageCount++;