From 482bd8114b0d5ff16c681a9a4d1f07f2266f14da Mon Sep 17 00:00:00 2001 From: Jessica James Date: Wed, 26 Aug 2020 01:41:03 -0500 Subject: [PATCH] Updated jupiter submodule; adjusted code as necessary to compile --- src/Jupiter | 2 +- src/Plugins/ExtraCommands/ExtraCommands.cpp | 4 ++-- src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp | 6 +++--- src/Plugins/RenX/RenX.Core/RenX_Server.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Jupiter b/src/Jupiter index 8445525..15c69ed 160000 --- a/src/Jupiter +++ b/src/Jupiter @@ -1 +1 @@ -Subproject commit 84455254c6fd4918e8f87f8804c0139bfc4487d4 +Subproject commit 15c69edc7c466077928dededc2028b65113b0fab diff --git a/src/Plugins/ExtraCommands/ExtraCommands.cpp b/src/Plugins/ExtraCommands/ExtraCommands.cpp index 292422b..433664c 100644 --- a/src/Plugins/ExtraCommands/ExtraCommands.cpp +++ b/src/Plugins/ExtraCommands/ExtraCommands.cpp @@ -264,8 +264,8 @@ Jupiter::GenericCommand::ResponseLine *DebugInfoGenericCommand::trigger(const Ju line = line->next; for (auto& user_pair : channel.getUsers()) { - Jupiter::IRC::Client::User *user = user_pair.second.getUser(); - line->next = new Jupiter::GenericCommand::ResponseLine(Jupiter::StringS::Format("User %.*s!%.*s@%.*s (prefix: %c) of channel %.*s (of %u shared)", user->getNickname().size(), user->getNickname().ptr(), user->getUsername().size(), user->getUsername().ptr(), user->getHostname().size(), user->getHostname().ptr(), channel.getUserPrefix(user_pair.second) ? channel.getUserPrefix(user_pair.second) : ' ', channel.getName().size(), channel.getName().ptr(), user->getChannelCount()), GenericCommand::DisplayType::PublicSuccess); + Jupiter::IRC::Client::User *user = user_pair.second->getUser(); + line->next = new Jupiter::GenericCommand::ResponseLine(Jupiter::StringS::Format("User %.*s!%.*s@%.*s (prefix: %c) of channel %.*s (of %u shared)", user->getNickname().size(), user->getNickname().ptr(), user->getUsername().size(), user->getUsername().ptr(), user->getHostname().size(), user->getHostname().ptr(), channel.getUserPrefix(*user_pair.second) ? channel.getUserPrefix(*user_pair.second) : ' ', channel.getName().size(), channel.getName().ptr(), user->getChannelCount()), GenericCommand::DisplayType::PublicSuccess); line = line->next; }; }; diff --git a/src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp b/src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp index e13550a..f4e0ff1 100644 --- a/src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp +++ b/src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp @@ -3413,10 +3413,10 @@ void ModRequestGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *play user_message += channel.getName(); for (auto& user : channel.getUsers()) { - if (channel.getUserPrefix(user.second) != 0 // If the user has a prefix... - && !user.second.getNickname().equals(server.getNickname())) { // And the user isn't this bot... + if (channel.getUserPrefix(*user.second) != 0 // If the user has a prefix... + && !user.second->getNickname().equals(server.getNickname())) { // And the user isn't this bot... // Alert the user - server.sendMessage(user.second.getNickname(), user_message); + server.sendMessage(user.second->getNickname(), user_message); ++total_user_alerts; } } diff --git a/src/Plugins/RenX/RenX.Core/RenX_Server.cpp b/src/Plugins/RenX/RenX.Core/RenX_Server.cpp index 6af0fed..949e2ae 100644 --- a/src/Plugins/RenX/RenX.Core/RenX_Server.cpp +++ b/src/Plugins/RenX/RenX.Core/RenX_Server.cpp @@ -680,8 +680,8 @@ void RenX::Server::banCheck(RenX::PlayerInfo &player) user_message += channel.second.getName(); for (auto& user : channel.second.getUsers()) { - if (channel.second.getUserPrefix(user.second) != 0 && user.second.getNickname().equals(server->getNickname()) == false) - server->sendMessage(user.second.getUser()->getNickname(), user_message); + if (channel.second.getUserPrefix(*user.second) != 0 && user.second->getNickname().equals(server->getNickname()) == false) + server->sendMessage(user.second->getUser()->getNickname(), user_message); } user_message -= channel.second.getName().size(); }