Browse Source

Updated Jupiter submodule to remove isNotEmpty; adjusted as necessary

master
Jessica James 3 years ago
parent
commit
fea7083cf8
  1. 4
      src/Bot/src/Main.cpp
  2. 2
      src/Jupiter
  3. 66
      src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp
  4. 2
      src/Plugins/RenX/RenX.Core/RenX_Functions.cpp
  5. 24
      src/Plugins/RenX/RenX.Core/RenX_Server.cpp
  6. 8
      src/Plugins/RenX/RenX.ExtraLogging/RenX_ExtraLogging.cpp
  7. 4
      src/Plugins/RenX/RenX.IRCJoin/RenX_IRCJoin.cpp
  8. 206
      src/Plugins/RenX/RenX.Logging/RenX_Logging.cpp
  9. 2
      src/Plugins/RenX/RenX.Medals/RenX_Medals.cpp
  10. 10
      src/Plugins/RenX/RenX.ModSystem/RenX_ModSystem.cpp
  11. 2
      src/Plugins/RenX/RenX.Warn/RenX_Warn.cpp
  12. 2
      src/Plugins/SetJoin/SetJoin.cpp

4
src/Bot/src/Main.cpp

@ -217,12 +217,12 @@ int main(int argc, const char **args) {
if (configs_directory.empty()) if (configs_directory.empty())
configs_directory = o_config.get("ConfigsDirectory"_jrs); configs_directory = o_config.get("ConfigsDirectory"_jrs);
if (plugins_directory.isNotEmpty()) { if (!plugins_directory.empty()) {
Jupiter::Plugin::setDirectory(plugins_directory); Jupiter::Plugin::setDirectory(plugins_directory);
printf("Plugins will be loaded from \"%.*s\"." ENDL, static_cast<int>(plugins_directory.size()), plugins_directory.data()); printf("Plugins will be loaded from \"%.*s\"." ENDL, static_cast<int>(plugins_directory.size()), plugins_directory.data());
} }
if (configs_directory.isNotEmpty()) { if (!configs_directory.empty()) {
Jupiter::Plugin::setConfigDirectory(configs_directory); Jupiter::Plugin::setConfigDirectory(configs_directory);
printf("Plugin configs will be loaded from \"%.*s\"." ENDL, static_cast<int>(configs_directory.size()), configs_directory.data()); printf("Plugin configs will be loaded from \"%.*s\"." ENDL, static_cast<int>(configs_directory.size()), configs_directory.data());
} }

2
src/Jupiter

@ -1 +1 @@
Subproject commit cee0c7ef7d5522c44100848c4f64c92fbeebdfaf Subproject commit 8bd27485a9bca535a598447aa550d862ba3a8b42

66
src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp

@ -200,7 +200,7 @@ void MsgIRCCommand::create()
void MsgIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void MsgIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
int type = source->getChannel(channel)->getType(); int type = source->getChannel(channel)->getType();
Jupiter::StringL msg; Jupiter::StringL msg;
@ -261,7 +261,7 @@ void PMsgIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &cha
msg += nick; msg += nick;
msg += "@IRC: "; msg += "@IRC: ";
msg += command_split.second; msg += command_split.second;
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
for (unsigned int i = 0; i != RenX::getCore()->getServerCount(); i++) for (unsigned int i = 0; i != RenX::getCore()->getServerCount(); i++)
{ {
@ -302,7 +302,7 @@ void HostMsgIRCCommand::create()
void HostMsgIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void HostMsgIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
int type = source->getChannel(channel)->getType(); int type = source->getChannel(channel)->getType();
@ -339,7 +339,7 @@ void AdminMsgIRCCommand::create()
void AdminMsgIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void AdminMsgIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
int type = source->getChannel(channel)->getType(); int type = source->getChannel(channel)->getType();
@ -387,7 +387,7 @@ void PAdminMsgIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString
msg += nick; msg += nick;
msg += "@IRC: "; msg += "@IRC: ";
msg += command_split.second; msg += command_split.second;
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
for (unsigned int i = 0; i != RenX::getCore()->getServerCount(); i++) for (unsigned int i = 0; i != RenX::getCore()->getServerCount(); i++)
{ {
@ -1043,7 +1043,7 @@ void SteamIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &ch
if (chan != nullptr) if (chan != nullptr)
{ {
int type = chan->getType(); int type = chan->getType();
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
Jupiter::StringL msg; Jupiter::StringL msg;
for (unsigned int i = 0; i != RenX::getCore()->getServerCount(); i++) for (unsigned int i = 0; i != RenX::getCore()->getServerCount(); i++)
@ -1126,7 +1126,7 @@ void KillDeathRatioIRCCommand::create()
void KillDeathRatioIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void KillDeathRatioIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
Jupiter::IRC::Client::Channel *chan = source->getChannel(channel); Jupiter::IRC::Client::Channel *chan = source->getChannel(channel);
if (chan != nullptr) if (chan != nullptr)
@ -1233,9 +1233,9 @@ void ModsIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &cha
{ {
for (auto node = server->players.begin(); node != server->players.end(); ++node) for (auto node = server->players.begin(); node != server->players.end(); ++node)
{ {
if (node->isBot == false && (node->adminType.isNotEmpty() || (node->access != 0 && (node->gamePrefix.isNotEmpty() || node->formatNamePrefix.isNotEmpty())))) if (node->isBot == false && (!node->adminType.empty() || (node->access != 0 && (!node->gamePrefix.empty() || !node->formatNamePrefix.empty()))))
{ {
if (msg.isNotEmpty()) if (!msg.empty())
msg += ", "; msg += ", ";
else msg += staff_word + "s in-game: "_jrs; else msg += staff_word + "s in-game: "_jrs;
msg += node->gamePrefix; msg += node->gamePrefix;
@ -1457,7 +1457,7 @@ void SetMapIRCCommand::create()
void SetMapIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void SetMapIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
Jupiter::IRC::Client::Channel *chan = source->getChannel(channel); Jupiter::IRC::Client::Channel *chan = source->getChannel(channel);
if (chan != nullptr) if (chan != nullptr)
@ -1502,7 +1502,7 @@ void MuteIRCCommand::create()
void MuteIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void MuteIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
Jupiter::IRC::Client::Channel *chan = source->getChannel(channel); Jupiter::IRC::Client::Channel *chan = source->getChannel(channel);
if (chan != nullptr) if (chan != nullptr)
@ -1551,7 +1551,7 @@ void UnMuteIRCCommand::create()
void UnMuteIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void UnMuteIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
Jupiter::IRC::Client::Channel *chan = source->getChannel(channel); Jupiter::IRC::Client::Channel *chan = source->getChannel(channel);
if (chan != nullptr) if (chan != nullptr)
@ -1600,7 +1600,7 @@ void KillIRCCommand::create()
void KillIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void KillIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
Jupiter::IRC::Client::Channel *chan = source->getChannel(channel); Jupiter::IRC::Client::Channel *chan = source->getChannel(channel);
if (chan != nullptr) if (chan != nullptr)
@ -1646,7 +1646,7 @@ void DisarmIRCCommand::create()
void DisarmIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void DisarmIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
Jupiter::IRC::Client::Channel *chan = source->getChannel(channel); Jupiter::IRC::Client::Channel *chan = source->getChannel(channel);
if (chan != nullptr) if (chan != nullptr)
@ -1697,7 +1697,7 @@ void DisarmC4IRCCommand::create()
void DisarmC4IRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void DisarmC4IRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
Jupiter::IRC::Client::Channel *chan = source->getChannel(channel); Jupiter::IRC::Client::Channel *chan = source->getChannel(channel);
if (chan != nullptr) if (chan != nullptr)
@ -1750,7 +1750,7 @@ void DisarmBeaconIRCCommand::create()
void DisarmBeaconIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void DisarmBeaconIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
Jupiter::IRC::Client::Channel *chan = source->getChannel(channel); Jupiter::IRC::Client::Channel *chan = source->getChannel(channel);
if (chan != nullptr) if (chan != nullptr)
@ -1801,7 +1801,7 @@ void MineBanIRCCommand::create()
void MineBanIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void MineBanIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
Jupiter::IRC::Client::Channel *chan = source->getChannel(channel); Jupiter::IRC::Client::Channel *chan = source->getChannel(channel);
if (chan != nullptr) if (chan != nullptr)
@ -2221,7 +2221,7 @@ void KickBanIRCCommand::create() {
} }
void KickBanIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) { void KickBanIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) {
if (parameters.isNotEmpty()) { if (!parameters.empty()) {
Jupiter::IRC::Client::Channel *chan = source->getChannel(channel); Jupiter::IRC::Client::Channel *chan = source->getChannel(channel);
if (chan != nullptr) { if (chan != nullptr) {
const auto& servers = RenX::getCore()->getServers(chan->getType()); const auto& servers = RenX::getCore()->getServers(chan->getType());
@ -2280,7 +2280,7 @@ void AddBanIRCCommand::create()
} }
void AddBanIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) { void AddBanIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) {
if (parameters.isNotEmpty()) { if (!parameters.empty()) {
Jupiter::IRC::Client::Channel *chan = source->getChannel(channel); Jupiter::IRC::Client::Channel *chan = source->getChannel(channel);
if (chan != nullptr) { if (chan != nullptr) {
std::vector<std::string_view> split_parameters = jessilib::word_split_view(std::string_view{parameters}, " \t="sv); std::vector<std::string_view> split_parameters = jessilib::word_split_view(std::string_view{parameters}, " \t="sv);
@ -2447,7 +2447,7 @@ const Jupiter::ReadableString &AddBanIRCCommand::getHelp(const Jupiter::Readable
{ {
static STRING_LITERAL_AS_NAMED_REFERENCE(defaultHelp, "Adds a ban entry to the ban list. Use \"help addban keys\" for a list of input keys. Syntax: AddBan <Key> <Value> [<Key> <Value> ...]"); static STRING_LITERAL_AS_NAMED_REFERENCE(defaultHelp, "Adds a ban entry to the ban list. Use \"help addban keys\" for a list of input keys. Syntax: AddBan <Key> <Value> [<Key> <Value> ...]");
static STRING_LITERAL_AS_NAMED_REFERENCE(keyHelp, "Valueless keys (flags): Game, Chat, Bot, Vote, Mine, Ladder, Alert; Value-paired keys: Name, IP, Steam, RDNS, Duration, Reason (MUST BE LAST)"); static STRING_LITERAL_AS_NAMED_REFERENCE(keyHelp, "Valueless keys (flags): Game, Chat, Bot, Vote, Mine, Ladder, Alert; Value-paired keys: Name, IP, Steam, RDNS, Duration, Reason (MUST BE LAST)");
if (parameters.isNotEmpty() && parameters.equalsi("keys"_jrs)) if (!parameters.empty() && parameters.equalsi("keys"_jrs))
return keyHelp; return keyHelp;
return defaultHelp; return defaultHelp;
} }
@ -2467,7 +2467,7 @@ void UnBanIRCCommand::create()
void UnBanIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void UnBanIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
size_t index = Jupiter::from_string<size_t>(parameters); size_t index = Jupiter::from_string<size_t>(parameters);
if (index < RenX::banDatabase->getEntries().size()) if (index < RenX::banDatabase->getEntries().size())
@ -2507,7 +2507,7 @@ void ExemptionSearchIRCCommand::create() {
void ExemptionSearchIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) { void ExemptionSearchIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) {
const auto& entries = RenX::exemptionDatabase->getEntries(); const auto& entries = RenX::exemptionDatabase->getEntries();
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
if (entries.size() == 0) { if (entries.size() == 0) {
source->sendNotice(nick, "The exemption database is empty!"sv); source->sendNotice(nick, "The exemption database is empty!"sv);
@ -2849,7 +2849,7 @@ const Jupiter::ReadableString &AddExemptionIRCCommand::getHelp(const Jupiter::Re
{ {
static STRING_LITERAL_AS_NAMED_REFERENCE(defaultHelp, "Adds an exemption entry to the exemption list. Use \"help addexemption keys\" for a list of input keys. Syntax: AddExemption <Key> <Value> [<Key> <Value> ...]"); static STRING_LITERAL_AS_NAMED_REFERENCE(defaultHelp, "Adds an exemption entry to the exemption list. Use \"help addexemption keys\" for a list of input keys. Syntax: AddExemption <Key> <Value> [<Key> <Value> ...]");
static STRING_LITERAL_AS_NAMED_REFERENCE(keyHelp, "Valueless keys (flags): Ban, Kick; Value-paired keys: IP, Steam, Duration"); static STRING_LITERAL_AS_NAMED_REFERENCE(keyHelp, "Valueless keys (flags): Ban, Kick; Value-paired keys: IP, Steam, Duration");
if (parameters.isNotEmpty() && parameters.equalsi("keys"_jrs)) if (!parameters.empty() && parameters.equalsi("keys"_jrs))
return keyHelp; return keyHelp;
return defaultHelp; return defaultHelp;
} }
@ -2869,7 +2869,7 @@ void UnExemptIRCCommand::create()
void UnExemptIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void UnExemptIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
size_t index = Jupiter::from_string<size_t>(parameters); size_t index = Jupiter::from_string<size_t>(parameters);
if (index < RenX::exemptionDatabase->getEntries().size()) if (index < RenX::exemptionDatabase->getEntries().size())
@ -3141,7 +3141,7 @@ void TeamChangeIRCCommand::create() {
} }
void TeamChangeIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) { void TeamChangeIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) {
if (parameters.isNotEmpty()) { if (!parameters.empty()) {
Jupiter::IRC::Client::Channel *chan = source->getChannel(channel); Jupiter::IRC::Client::Channel *chan = source->getChannel(channel);
if (chan != nullptr) { if (chan != nullptr) {
int type = chan->getType(); int type = chan->getType();
@ -3188,7 +3188,7 @@ void TeamChange2IRCCommand::create()
} }
void TeamChange2IRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) { void TeamChange2IRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) {
if (parameters.isNotEmpty()) { if (!parameters.empty()) {
Jupiter::IRC::Client::Channel *chan = source->getChannel(channel); Jupiter::IRC::Client::Channel *chan = source->getChannel(channel);
if (chan != nullptr) { if (chan != nullptr) {
int type = chan->getType(); int type = chan->getType();
@ -3467,7 +3467,7 @@ void ModsGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *, const Ju
Jupiter::StringL msg; Jupiter::StringL msg;
const Jupiter::ReadableString &staff_word = pluginInstance.getStaffTitle(); const Jupiter::ReadableString &staff_word = pluginInstance.getStaffTitle();
for (auto node = source->players.begin(); node != source->players.end(); ++node) { for (auto node = source->players.begin(); node != source->players.end(); ++node) {
if (node->isBot == false && (node->adminType.isNotEmpty() || (node->access != 0 && (node->gamePrefix.isNotEmpty() || node->formatNamePrefix.isNotEmpty())))) { if (node->isBot == false && (!node->adminType.empty() || (node->access != 0 && (!node->gamePrefix.empty() || !node->formatNamePrefix.empty())))) {
if (msg.empty()) if (msg.empty())
msg = staff_word + "s in-game: "_jrs; msg = staff_word + "s in-game: "_jrs;
else else
@ -3597,7 +3597,7 @@ void AdminMessageGameCommand::create() {
} }
void AdminMessageGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters) { void AdminMessageGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters) {
if (parameters.isNotEmpty()) { if (!parameters.empty()) {
Jupiter::StringS msg = player->gamePrefix + player->name + ": "_jrs + parameters; Jupiter::StringS msg = player->gamePrefix + player->name + ": "_jrs + parameters;
source->sendAdminMessage(msg); source->sendAdminMessage(msg);
} }
@ -3661,7 +3661,7 @@ void KillGameCommand::create() {
} }
void KillGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters) { void KillGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters) {
if (parameters.isNotEmpty()) { if (!parameters.empty()) {
RenX::PlayerInfo *target = source->getPlayerByPartName(parameters); RenX::PlayerInfo *target = source->getPlayerByPartName(parameters);
if (target == nullptr) { if (target == nullptr) {
source->sendMessage(*player, "Error: Player not found."_jrs); source->sendMessage(*player, "Error: Player not found."_jrs);
@ -3693,7 +3693,7 @@ void DisarmGameCommand::create() {
} }
void DisarmGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters) { void DisarmGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters) {
if (parameters.isNotEmpty()) { if (!parameters.empty()) {
RenX::PlayerInfo *target = source->getPlayerByPartName(parameters); RenX::PlayerInfo *target = source->getPlayerByPartName(parameters);
if (target == nullptr) if (target == nullptr)
source->sendMessage(*player, "Error: Player not found."_jrs); source->sendMessage(*player, "Error: Player not found."_jrs);
@ -3723,7 +3723,7 @@ void DisarmC4GameCommand::create() {
} }
void DisarmC4GameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters) { void DisarmC4GameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters) {
if (parameters.isNotEmpty()) { if (!parameters.empty()) {
RenX::PlayerInfo *target = source->getPlayerByPartName(parameters); RenX::PlayerInfo *target = source->getPlayerByPartName(parameters);
if (target == nullptr) if (target == nullptr)
source->sendMessage(*player, "Error: Player not found."_jrs); source->sendMessage(*player, "Error: Player not found."_jrs);
@ -3755,7 +3755,7 @@ void DisarmBeaconGameCommand::create() {
} }
void DisarmBeaconGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters) { void DisarmBeaconGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters) {
if (parameters.isNotEmpty()) { if (!parameters.empty()) {
RenX::PlayerInfo *target = source->getPlayerByPartName(parameters); RenX::PlayerInfo *target = source->getPlayerByPartName(parameters);
if (target == nullptr) if (target == nullptr)
source->sendMessage(*player, "Error: Player not found."_jrs); source->sendMessage(*player, "Error: Player not found."_jrs);
@ -3785,7 +3785,7 @@ void MineBanGameCommand::create() {
} }
void MineBanGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters) { void MineBanGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters) {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
RenX::PlayerInfo *target = source->getPlayerByPartName(parameters); RenX::PlayerInfo *target = source->getPlayerByPartName(parameters);
if (target == nullptr) if (target == nullptr)

2
src/Plugins/RenX/RenX.Core/RenX_Functions.cpp

@ -498,7 +498,7 @@ std::string_view RenX::translateName(std::string_view obj)
return ""_jrs; return ""_jrs;
Jupiter::ReferenceString iniTranslation = RenX::getCore()->getConfig()["Name"_jrs].get(Jupiter::ReferenceString{obj}); Jupiter::ReferenceString iniTranslation = RenX::getCore()->getConfig()["Name"_jrs].get(Jupiter::ReferenceString{obj});
if (iniTranslation.isNotEmpty()) if (!iniTranslation.empty())
return iniTranslation; return iniTranslation;
Jupiter::ReferenceString object = obj; Jupiter::ReferenceString object = obj;

24
src/Plugins/RenX/RenX.Core/RenX_Server.cpp

@ -1183,7 +1183,7 @@ void RenX::Server::sendPubChan(const char *fmt, ...) const {
va_start(args, fmt); va_start(args, fmt);
Jupiter::StringL msg; Jupiter::StringL msg;
const Jupiter::ReadableString &serverPrefix = getPrefix(); const Jupiter::ReadableString &serverPrefix = getPrefix();
if (serverPrefix.isNotEmpty()) { if (!serverPrefix.empty()) {
msg += serverPrefix; msg += serverPrefix;
msg += ' '; msg += ' ';
msg.avformat(fmt, args); msg.avformat(fmt, args);
@ -1199,7 +1199,7 @@ void RenX::Server::sendPubChan(const char *fmt, ...) const {
void RenX::Server::sendPubChan(const Jupiter::ReadableString &msg) const { void RenX::Server::sendPubChan(const Jupiter::ReadableString &msg) const {
const Jupiter::ReadableString &prefix = getPrefix(); const Jupiter::ReadableString &prefix = getPrefix();
if (prefix.isNotEmpty()) { if (!prefix.empty()) {
Jupiter::String m(msg.size() + prefix.size() + 1); Jupiter::String m(msg.size() + prefix.size() + 1);
m.set(prefix); m.set(prefix);
m += ' '; m += ' ';
@ -1221,7 +1221,7 @@ void RenX::Server::sendAdmChan(const char *fmt, ...) const {
va_start(args, fmt); va_start(args, fmt);
Jupiter::StringL msg; Jupiter::StringL msg;
const Jupiter::ReadableString &serverPrefix = getPrefix(); const Jupiter::ReadableString &serverPrefix = getPrefix();
if (serverPrefix.isNotEmpty()) { if (!serverPrefix.empty()) {
msg += serverPrefix; msg += serverPrefix;
msg += ' '; msg += ' ';
msg.avformat(fmt, args); msg.avformat(fmt, args);
@ -1237,7 +1237,7 @@ void RenX::Server::sendAdmChan(const char *fmt, ...) const {
void RenX::Server::sendAdmChan(const Jupiter::ReadableString &msg) const { void RenX::Server::sendAdmChan(const Jupiter::ReadableString &msg) const {
const Jupiter::ReadableString &prefix = getPrefix(); const Jupiter::ReadableString &prefix = getPrefix();
if (prefix.isNotEmpty()) { if (!prefix.empty()) {
Jupiter::String m(msg.size() + prefix.size() + 1); Jupiter::String m(msg.size() + prefix.size() + 1);
m.set(prefix); m.set(prefix);
m += ' '; m += ' ';
@ -1260,7 +1260,7 @@ void RenX::Server::sendLogChan(const char *fmt, ...) const {
va_start(args, fmt); va_start(args, fmt);
Jupiter::StringL msg; Jupiter::StringL msg;
const Jupiter::ReadableString &serverPrefix = getPrefix(); const Jupiter::ReadableString &serverPrefix = getPrefix();
if (serverPrefix.isNotEmpty()) { if (!serverPrefix.empty()) {
msg += serverPrefix; msg += serverPrefix;
msg += ' '; msg += ' ';
msg.avformat(fmt, args); msg.avformat(fmt, args);
@ -1279,7 +1279,7 @@ void RenX::Server::sendLogChan(const char *fmt, ...) const {
void RenX::Server::sendLogChan(const Jupiter::ReadableString &msg) const { void RenX::Server::sendLogChan(const Jupiter::ReadableString &msg) const {
IRC_Bot *server; IRC_Bot *server;
const Jupiter::ReadableString &prefix = getPrefix(); const Jupiter::ReadableString &prefix = getPrefix();
if (prefix.isNotEmpty()) { if (!prefix.empty()) {
Jupiter::String m(msg.size() + prefix.size() + 1); Jupiter::String m(msg.size() + prefix.size() + 1);
m.set(prefix); m.set(prefix);
m += ' '; m += ' ';
@ -1455,7 +1455,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) {
Jupiter::ReferenceString idToken = player_tokens[1]; Jupiter::ReferenceString idToken = player_tokens[1];
result.name = player_tokens[2]; result.name = player_tokens[2];
result.team = RenX::getTeam(player_tokens[0]); result.team = RenX::getTeam(player_tokens[0]);
if (idToken.isNotEmpty() && idToken[0] == 'b') { if (!idToken.empty() && idToken[0] == 'b') {
idToken.remove_prefix(1); idToken.remove_prefix(1);
result.isBot = true; result.isBot = true;
result.isPlayer = true; result.isPlayer = true;
@ -1548,7 +1548,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) {
{ {
bool recalcUUID = false; bool recalcUUID = false;
player->team = team; player->team = team;
if (player->ip32 == 0 && ip.isNotEmpty()) if (player->ip32 == 0 && !ip.empty())
{ {
player->ip = ip; player->ip = ip;
player->ip32 = Jupiter::Socket::pton4(static_cast<std::string>(player->ip).c_str()); player->ip32 = Jupiter::Socket::pton4(static_cast<std::string>(player->ip).c_str());
@ -1559,7 +1559,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) {
} }
recalcUUID = true; recalcUUID = true;
} }
if (player->hwid.empty() && hwid.isNotEmpty()) if (player->hwid.empty() && !hwid.empty())
{ {
player->hwid = hwid; player->hwid = hwid;
recalcUUID = true; recalcUUID = true;
@ -1621,7 +1621,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) {
} }
}; };
if (tokens[0].isNotEmpty()) if (!tokens[0].empty())
{ {
char header = tokens[0][0]; char header = tokens[0][0];
tokens[0].shiftRight(1); tokens[0].shiftRight(1);
@ -1631,7 +1631,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) {
if (jessilib::equalsi(m_lastCommand, "clientlist"sv)) if (jessilib::equalsi(m_lastCommand, "clientlist"sv))
{ {
// ID | IP | Steam ID | Admin Status | Team | Name // ID | IP | Steam ID | Admin Status | Team | Name
if (tokens[0].isNotEmpty()) if (!tokens[0].empty())
{ {
bool isBot = false; bool isBot = false;
int id; int id;
@ -2440,7 +2440,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) {
// "player" | Player | "suicide by" | Damage Type // "player" | Player | "suicide by" | Damage Type
// NOTE: Filter these out when Player.empty(). // NOTE: Filter these out when Player.empty().
Jupiter::ReferenceString playerToken = getToken(3); Jupiter::ReferenceString playerToken = getToken(3);
if (playerToken.isNotEmpty()) if (!playerToken.empty())
{ {
RenX::PlayerInfo *player = parseGetPlayerOrAdd(playerToken); RenX::PlayerInfo *player = parseGetPlayerOrAdd(playerToken);
Jupiter::ReferenceString type = getToken(4); Jupiter::ReferenceString type = getToken(4);

8
src/Plugins/RenX/RenX.ExtraLogging/RenX_ExtraLogging.cpp

@ -62,7 +62,7 @@ bool RenX_ExtraLoggingPlugin::initialize() {
if (!logFile.empty()) { if (!logFile.empty()) {
RenX_ExtraLoggingPlugin::file = fopen(logFile.c_str(), "a+b"); RenX_ExtraLoggingPlugin::file = fopen(logFile.c_str(), "a+b");
if (RenX_ExtraLoggingPlugin::file != nullptr && RenX_ExtraLoggingPlugin::newDayFmt.isNotEmpty()) { if (RenX_ExtraLoggingPlugin::file != nullptr && !RenX_ExtraLoggingPlugin::newDayFmt.empty()) {
Jupiter::String line = RenX_ExtraLoggingPlugin::newDayFmt; Jupiter::String line = RenX_ExtraLoggingPlugin::newDayFmt;
RenX::processTags(line); RenX::processTags(line);
fwrite(line.data(), sizeof(char), line.size(), file); fwrite(line.data(), sizeof(char), line.size(), file);
@ -76,7 +76,7 @@ bool RenX_ExtraLoggingPlugin::initialize() {
} }
int RenX_ExtraLoggingPlugin::think() { int RenX_ExtraLoggingPlugin::think() {
if (RenX_ExtraLoggingPlugin::file != nullptr && RenX_ExtraLoggingPlugin::newDayFmt.isNotEmpty()) { if (RenX_ExtraLoggingPlugin::file != nullptr && !RenX_ExtraLoggingPlugin::newDayFmt.empty()) {
time_t current_time = time(nullptr); time_t current_time = time(nullptr);
int currentDay = localtime(&current_time)->tm_yday; int currentDay = localtime(&current_time)->tm_yday;
if (currentDay != RenX_ExtraLoggingPlugin::day) if (currentDay != RenX_ExtraLoggingPlugin::day)
@ -93,7 +93,7 @@ int RenX_ExtraLoggingPlugin::think() {
void RenX_ExtraLoggingPlugin::RenX_OnRaw(RenX::Server &server, const Jupiter::ReadableString &raw) { void RenX_ExtraLoggingPlugin::RenX_OnRaw(RenX::Server &server, const Jupiter::ReadableString &raw) {
if (RenX_ExtraLoggingPlugin::printToConsole) { if (RenX_ExtraLoggingPlugin::printToConsole) {
if (RenX_ExtraLoggingPlugin::consolePrefix.isNotEmpty()) { if (!RenX_ExtraLoggingPlugin::consolePrefix.empty()) {
Jupiter::StringS cPrefix = RenX_ExtraLoggingPlugin::consolePrefix; Jupiter::StringS cPrefix = RenX_ExtraLoggingPlugin::consolePrefix;
RenX::processTags(cPrefix, &server); RenX::processTags(cPrefix, &server);
fwrite(cPrefix.data(), sizeof(char), cPrefix.size(), stdout); fwrite(cPrefix.data(), sizeof(char), cPrefix.size(), stdout);
@ -104,7 +104,7 @@ void RenX_ExtraLoggingPlugin::RenX_OnRaw(RenX::Server &server, const Jupiter::Re
} }
if (RenX_ExtraLoggingPlugin::file != nullptr) { if (RenX_ExtraLoggingPlugin::file != nullptr) {
if (RenX_ExtraLoggingPlugin::filePrefix.isNotEmpty()) { if (!RenX_ExtraLoggingPlugin::filePrefix.empty()) {
Jupiter::StringS fPrefix = RenX_ExtraLoggingPlugin::filePrefix; Jupiter::StringS fPrefix = RenX_ExtraLoggingPlugin::filePrefix;
RenX::processTags(fPrefix, &server); RenX::processTags(fPrefix, &server);
fwrite(fPrefix.data(), sizeof(char), fPrefix.size(), file); fwrite(fPrefix.data(), sizeof(char), fPrefix.size(), file);

4
src/Plugins/RenX/RenX.IRCJoin/RenX_IRCJoin.cpp

@ -43,7 +43,7 @@ bool RenX_IRCJoinPlugin::initialize()
void RenX_IRCJoinPlugin::OnJoin(Jupiter::IRC::Client *source, std::string_view channel, std::string_view nick) void RenX_IRCJoinPlugin::OnJoin(Jupiter::IRC::Client *source, std::string_view channel, std::string_view nick)
{ {
if (RenX_IRCJoinPlugin::joinFmt.isNotEmpty()) if (!RenX_IRCJoinPlugin::joinFmt.empty())
{ {
RenX::Server *server; RenX::Server *server;
int type = source->getChannel(channel)->getType(); int type = source->getChannel(channel)->getType();
@ -69,7 +69,7 @@ void RenX_IRCJoinPlugin::OnJoin(Jupiter::IRC::Client *source, std::string_view c
void RenX_IRCJoinPlugin::OnPart(Jupiter::IRC::Client *source, std::string_view channel, std::string_view nick, std::string_view reason) void RenX_IRCJoinPlugin::OnPart(Jupiter::IRC::Client *source, std::string_view channel, std::string_view nick, std::string_view reason)
{ {
if (RenX_IRCJoinPlugin::partFmt.isNotEmpty()) if (!RenX_IRCJoinPlugin::partFmt.empty())
{ {
int access = source->getAccessLevel(channel, nick); int access = source->getAccessLevel(channel, nick);

206
src/Plugins/RenX/RenX.Logging/RenX_Logging.cpp

@ -791,7 +791,7 @@ void RenX_LoggingPlugin::RenX_OnPlayerRDNS(RenX::Server &server, const RenX::Pla
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->playerRDNSFmt; Jupiter::String msg = this->playerRDNSFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
(server.*func)(msg); (server.*func)(msg);
@ -807,7 +807,7 @@ void RenX_LoggingPlugin::RenX_OnPlayerIdentify(RenX::Server &server, const RenX:
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->playerIdentifyFmt; Jupiter::String msg = this->playerIdentifyFmt;
if (msg.isNotEmpty() && server.isMatchPending() == false) if (!msg.empty() && server.isMatchPending() == false)
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
(server.*func)(msg); (server.*func)(msg);
@ -820,7 +820,7 @@ void RenX_LoggingPlugin::RenX_OnJoin(RenX::Server &server, const RenX::PlayerInf
if (RenX_LoggingPlugin::joinPublic) if (RenX_LoggingPlugin::joinPublic)
{ {
msg = this->joinPublicFmt; msg = this->joinPublicFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
server.sendPubChan(msg); server.sendPubChan(msg);
@ -831,7 +831,7 @@ void RenX_LoggingPlugin::RenX_OnJoin(RenX::Server &server, const RenX::PlayerInf
else else
msg = this->joinAdminFmt; msg = this->joinAdminFmt;
if (msg.isNotEmpty() && server.isMatchPending() == false) if (!msg.empty() && server.isMatchPending() == false)
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
server.sendAdmChan(msg); server.sendAdmChan(msg);
@ -847,7 +847,7 @@ void RenX_LoggingPlugin::RenX_OnPart(RenX::Server &server, const RenX::PlayerInf
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->partFmt; Jupiter::String msg = this->partFmt;
if (msg.isNotEmpty() && (server.isTravelling() == false || server.isSeamless())) if (!msg.empty() && (server.isTravelling() == false || server.isSeamless()))
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
(server.*func)(msg); (server.*func)(msg);
@ -863,7 +863,7 @@ void RenX_LoggingPlugin::RenX_OnKick(RenX::Server &server, const RenX::PlayerInf
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->kickFmt; Jupiter::String msg = this->kickFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, reason); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, reason);
@ -880,7 +880,7 @@ void RenX_LoggingPlugin::RenX_OnNameChange(RenX::Server &server, const RenX::Pla
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->nameChangeFmt; Jupiter::String msg = this->nameChangeFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_NEW_NAME_TAG, newPlayerName); msg.replace(RenX::tags->INTERNAL_NEW_NAME_TAG, newPlayerName);
@ -897,7 +897,7 @@ void RenX_LoggingPlugin::RenX_OnTeamChange(RenX::Server &server, const RenX::Pla
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->teamChangeFmt; Jupiter::String msg = this->teamChangeFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
(server.*func)(msg); (server.*func)(msg);
@ -913,7 +913,7 @@ void RenX_LoggingPlugin::RenX_OnSpeedHack(RenX::Server &server, const RenX::Play
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->speedHackFmt; Jupiter::String msg = this->speedHackFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
(server.*func)(msg); (server.*func)(msg);
@ -929,7 +929,7 @@ void RenX_LoggingPlugin::RenX_OnExecute(RenX::Server &server, const RenX::Player
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->playerExecuteFmt; Jupiter::String msg = this->playerExecuteFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, command); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, command);
@ -949,7 +949,7 @@ void RenX_LoggingPlugin::RenX_OnPlayerCommand(RenX::Server &server, const RenX::
? this->playerCommandSuccessFmt ? this->playerCommandSuccessFmt
: this->playerCommandFailFmt; : this->playerCommandFailFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message);
@ -966,7 +966,7 @@ void RenX_LoggingPlugin::RenX_OnPlayer(RenX::Server &server, const Jupiter::Read
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->playerFmt; Jupiter::String msg = this->playerFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw);
@ -983,7 +983,7 @@ void RenX_LoggingPlugin::RenX_OnChat(RenX::Server &server, const RenX::PlayerInf
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->chatFmt; Jupiter::String msg = this->chatFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message);
@ -1000,7 +1000,7 @@ void RenX_LoggingPlugin::RenX_OnTeamChat(RenX::Server &server, const RenX::Playe
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->teamChatFmt; Jupiter::String msg = this->teamChatFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message);
@ -1017,7 +1017,7 @@ void RenX_LoggingPlugin::RenX_OnRadioChat(RenX::Server &server, const RenX::Play
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->radioChatFmt; Jupiter::String msg = this->radioChatFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message);
@ -1034,7 +1034,7 @@ void RenX_LoggingPlugin::RenX_OnHostChat(RenX::Server &server, const Jupiter::Re
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->hostChatFmt; Jupiter::String msg = this->hostChatFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message);
@ -1051,7 +1051,7 @@ void RenX_LoggingPlugin::RenX_OnHostPage(RenX::Server &server, const RenX::Playe
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->hostPageFmt; Jupiter::String msg = this->hostPageFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message);
@ -1068,7 +1068,7 @@ void RenX_LoggingPlugin::RenX_OnAdminMessage(RenX::Server &server, const RenX::P
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->adminMsgFmt; Jupiter::String msg = this->adminMsgFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message);
@ -1085,7 +1085,7 @@ void RenX_LoggingPlugin::RenX_OnWarnMessage(RenX::Server &server, const RenX::Pl
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->warnMsgFmt; Jupiter::String msg = this->warnMsgFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message);
@ -1102,7 +1102,7 @@ void RenX_LoggingPlugin::RenX_OnAdminPMessage(RenX::Server &server, const RenX::
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->pAdminMsgFmt; Jupiter::String msg = this->pAdminMsgFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player, &target); RenX::processTags(msg, &server, &player, &target);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message);
@ -1119,7 +1119,7 @@ void RenX_LoggingPlugin::RenX_OnWarnPMessage(RenX::Server &server, const RenX::P
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->pWarnMsgFmt; Jupiter::String msg = this->pWarnMsgFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player, &target); RenX::processTags(msg, &server, &player, &target);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, message);
@ -1136,7 +1136,7 @@ void RenX_LoggingPlugin::RenX_OnHostAdminMessage(RenX::Server &server, const Jup
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->adminMsgFmt; Jupiter::String msg = this->adminMsgFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_NAME_TAG, "Host"_jrs); msg.replace(RenX::tags->INTERNAL_NAME_TAG, "Host"_jrs);
@ -1155,7 +1155,7 @@ void RenX_LoggingPlugin::RenX_OnHostAdminPMessage(RenX::Server &server, const Re
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->pAdminMsgFmt; Jupiter::String msg = this->pAdminMsgFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, nullptr, &player); RenX::processTags(msg, &server, nullptr, &player);
msg.replace(RenX::tags->INTERNAL_NAME_TAG, "Host"_jrs); msg.replace(RenX::tags->INTERNAL_NAME_TAG, "Host"_jrs);
@ -1174,7 +1174,7 @@ void RenX_LoggingPlugin::RenX_OnHostWarnMessage(RenX::Server &server, const Jupi
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->warnMsgFmt; Jupiter::String msg = this->warnMsgFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_NAME_TAG, "Host"_jrs); msg.replace(RenX::tags->INTERNAL_NAME_TAG, "Host"_jrs);
@ -1193,7 +1193,7 @@ void RenX_LoggingPlugin::RenX_OnHostWarnPMessage(RenX::Server &server, const Ren
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->pWarnMsgFmt; Jupiter::String msg = this->pWarnMsgFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, nullptr, &player); RenX::processTags(msg, &server, nullptr, &player);
msg.replace(RenX::tags->INTERNAL_NAME_TAG, "Host"_jrs); msg.replace(RenX::tags->INTERNAL_NAME_TAG, "Host"_jrs);
@ -1212,7 +1212,7 @@ void RenX_LoggingPlugin::RenX_OnOtherChat(RenX::Server &server, const Jupiter::R
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->otherChatFmt; Jupiter::String msg = this->otherChatFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw);
@ -1239,7 +1239,7 @@ void RenX_LoggingPlugin::RenX_OnDeploy(RenX::Server &server, const RenX::PlayerI
msg = this->mineDeployFmt; msg = this->mineDeployFmt;
} }
if (msg.isNotEmpty()) { if (!msg.empty()) {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(object)); msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(object));
(server.*func)(msg); (server.*func)(msg);
@ -1255,7 +1255,7 @@ void RenX_LoggingPlugin::RenX_OnOverMine(RenX::Server &server, const RenX::Playe
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->overMineFmt; Jupiter::String msg = this->overMineFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(location)); msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(location));
@ -1283,7 +1283,7 @@ void RenX_LoggingPlugin::RenX_OnDisarm(RenX::Server &server, const RenX::PlayerI
msg = this->mineDisarmFmt; msg = this->mineDisarmFmt;
} }
if (msg.isNotEmpty()) { if (!msg.empty()) {
RenX::processTags(msg, &server, &player, &victim); RenX::processTags(msg, &server, &player, &victim);
msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(object)); msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(object));
(server.*func)(msg); (server.*func)(msg);
@ -1310,7 +1310,7 @@ void RenX_LoggingPlugin::RenX_OnDisarm(RenX::Server &server, const RenX::PlayerI
msg = this->mineDisarmNoOwnerFmt; msg = this->mineDisarmNoOwnerFmt;
} }
if (msg.isNotEmpty()) { if (!msg.empty()) {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(object)); msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(object));
(server.*func)(msg); (server.*func)(msg);
@ -1326,7 +1326,7 @@ void RenX_LoggingPlugin::RenX_OnExplode(RenX::Server &server, const RenX::Player
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->explodeFmt; Jupiter::String msg = this->explodeFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_WEAPON_TAG, RenX::translateName(object)); msg.replace(RenX::tags->INTERNAL_WEAPON_TAG, RenX::translateName(object));
@ -1344,7 +1344,7 @@ void RenX_LoggingPlugin::RenX_OnExplode(RenX::Server &server, const Jupiter::Rea
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->explodeNoOwnerFmt; Jupiter::String msg = this->explodeNoOwnerFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_WEAPON_TAG, RenX::translateName(object)); msg.replace(RenX::tags->INTERNAL_WEAPON_TAG, RenX::translateName(object));
@ -1362,7 +1362,7 @@ void RenX_LoggingPlugin::RenX_OnSuicide(RenX::Server &server, const RenX::Player
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->suicideFmt; Jupiter::String msg = this->suicideFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_WEAPON_TAG, RenX::translateName(damageType)); msg.replace(RenX::tags->INTERNAL_WEAPON_TAG, RenX::translateName(damageType));
@ -1379,7 +1379,7 @@ void RenX_LoggingPlugin::RenX_OnKill(RenX::Server &server, const RenX::PlayerInf
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->killFmt; Jupiter::String msg = this->killFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player, &victim); RenX::processTags(msg, &server, &player, &victim);
msg.replace(RenX::tags->INTERNAL_WEAPON_TAG, RenX::translateName(damageType)); msg.replace(RenX::tags->INTERNAL_WEAPON_TAG, RenX::translateName(damageType));
@ -1396,7 +1396,7 @@ void RenX_LoggingPlugin::RenX_OnKill(RenX::Server &server, const Jupiter::Readab
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->killFmt2; Jupiter::String msg = this->killFmt2;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, nullptr, &victim); RenX::processTags(msg, &server, nullptr, &victim);
msg.replace(RenX::tags->INTERNAL_NAME_TAG, RenX::translateName(killer)); msg.replace(RenX::tags->INTERNAL_NAME_TAG, RenX::translateName(killer));
@ -1417,7 +1417,7 @@ void RenX_LoggingPlugin::RenX_OnDie(RenX::Server &server, const RenX::PlayerInfo
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->dieFmt; Jupiter::String msg = this->dieFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_WEAPON_TAG, RenX::translateName(damageType)); msg.replace(RenX::tags->INTERNAL_WEAPON_TAG, RenX::translateName(damageType));
@ -1434,7 +1434,7 @@ void RenX_LoggingPlugin::RenX_OnDie(RenX::Server &server, const Jupiter::Readabl
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->dieFmt2; Jupiter::String msg = this->dieFmt2;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_NAME_TAG, RenX::translateName(object)); msg.replace(RenX::tags->INTERNAL_NAME_TAG, RenX::translateName(object));
@ -1467,7 +1467,7 @@ void RenX_LoggingPlugin::RenX_OnDestroy(RenX::Server &server, const RenX::Player
msg = this->destroyVehicleFmt; msg = this->destroyVehicleFmt;
break; break;
} }
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_VICTIM_TEAM_COLOR_TAG, RenX::getTeamColor(objectTeam)); msg.replace(RenX::tags->INTERNAL_VICTIM_TEAM_COLOR_TAG, RenX::getTeamColor(objectTeam));
@ -1488,7 +1488,7 @@ void RenX_LoggingPlugin::RenX_OnCapture(RenX::Server &server, const RenX::Player
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->captureFmt; Jupiter::String msg = this->captureFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(building)); msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(building));
@ -1508,7 +1508,7 @@ void RenX_LoggingPlugin::RenX_OnNeutralize(RenX::Server &server, const RenX::Pla
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->neutralizeFmt; Jupiter::String msg = this->neutralizeFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(building)); msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(building));
@ -1528,7 +1528,7 @@ void RenX_LoggingPlugin::RenX_OnCharacterPurchase(RenX::Server &server, const Re
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->characterPurchaseFmt; Jupiter::String msg = this->characterPurchaseFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_VICTIM_CHARACTER_TAG, RenX::translateName(character)); msg.replace(RenX::tags->INTERNAL_VICTIM_CHARACTER_TAG, RenX::translateName(character));
@ -1545,7 +1545,7 @@ void RenX_LoggingPlugin::RenX_OnItemPurchase(RenX::Server &server, const RenX::P
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->itemPurchaseFmt; Jupiter::String msg = this->itemPurchaseFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(item)); msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(item));
@ -1562,7 +1562,7 @@ void RenX_LoggingPlugin::RenX_OnWeaponPurchase(RenX::Server &server, const RenX:
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->weaponPurchaseFmt; Jupiter::String msg = this->weaponPurchaseFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_WEAPON_TAG, RenX::translateName(weapon)); msg.replace(RenX::tags->INTERNAL_WEAPON_TAG, RenX::translateName(weapon));
@ -1579,7 +1579,7 @@ void RenX_LoggingPlugin::RenX_OnRefillPurchase(RenX::Server &server, const RenX:
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->refillPurchaseFmt; Jupiter::String msg = this->refillPurchaseFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
(server.*func)(msg); (server.*func)(msg);
@ -1595,7 +1595,7 @@ void RenX_LoggingPlugin::RenX_OnVehiclePurchase(RenX::Server &server, const RenX
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->vehiclePurchaseFmt; Jupiter::String msg = this->vehiclePurchaseFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &owner); RenX::processTags(msg, &server, &owner);
msg.replace(RenX::tags->INTERNAL_VICTIM_VEHICLE_TAG, RenX::translateName(vehicle)); msg.replace(RenX::tags->INTERNAL_VICTIM_VEHICLE_TAG, RenX::translateName(vehicle));
@ -1612,7 +1612,7 @@ void RenX_LoggingPlugin::RenX_OnVehicleSpawn(RenX::Server &server, const RenX::T
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->vehicleSpawnFmt; Jupiter::String msg = this->vehicleSpawnFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::TeamType otherTeam = RenX::getEnemy(team); RenX::TeamType otherTeam = RenX::getEnemy(team);
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
@ -1636,7 +1636,7 @@ void RenX_LoggingPlugin::RenX_OnSpawn(RenX::Server &server, const RenX::PlayerIn
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->spawnFmt; Jupiter::String msg = this->spawnFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_VICTIM_CHARACTER_TAG, RenX::translateName(character)); msg.replace(RenX::tags->INTERNAL_VICTIM_CHARACTER_TAG, RenX::translateName(character));
@ -1653,7 +1653,7 @@ void RenX_LoggingPlugin::RenX_OnBotJoin(RenX::Server &server, const RenX::Player
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->botJoinFmt; Jupiter::String msg = this->botJoinFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
(server.*func)(msg); (server.*func)(msg);
@ -1669,7 +1669,7 @@ void RenX_LoggingPlugin::RenX_OnVehicleCrate(RenX::Server &server, const RenX::P
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->vehicleCrateFmt; Jupiter::String msg = this->vehicleCrateFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(vehicle)); msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(vehicle));
@ -1686,7 +1686,7 @@ void RenX_LoggingPlugin::RenX_OnTSVehicleCrate(RenX::Server &server, const RenX:
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->TSVehicleCrateFmt; Jupiter::String msg = this->TSVehicleCrateFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(vehicle)); msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(vehicle));
@ -1703,7 +1703,7 @@ void RenX_LoggingPlugin::RenX_OnRAVehicleCrate(RenX::Server &server, const RenX:
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->RAVehicleCrateFmt; Jupiter::String msg = this->RAVehicleCrateFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(vehicle)); msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(vehicle));
@ -1720,7 +1720,7 @@ void RenX_LoggingPlugin::RenX_OnDeathCrate(RenX::Server &server, const RenX::Pla
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->deathCrateFmt; Jupiter::String msg = this->deathCrateFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
(server.*func)(msg); (server.*func)(msg);
@ -1736,7 +1736,7 @@ void RenX_LoggingPlugin::RenX_OnMoneyCrate(RenX::Server &server, const RenX::Pla
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->moneyCrateFmt; Jupiter::String msg = this->moneyCrateFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, Jupiter::StringS::Format("%d", amount)); msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, Jupiter::StringS::Format("%d", amount));
@ -1753,7 +1753,7 @@ void RenX_LoggingPlugin::RenX_OnCharacterCrate(RenX::Server &server, const RenX:
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->characterCrateFmt; Jupiter::String msg = this->characterCrateFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_VICTIM_CHARACTER_TAG, RenX::translateName(character)); msg.replace(RenX::tags->INTERNAL_VICTIM_CHARACTER_TAG, RenX::translateName(character));
@ -1770,7 +1770,7 @@ void RenX_LoggingPlugin::RenX_OnSpyCrate(RenX::Server &server, const RenX::Playe
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->spyCrateFmt; Jupiter::String msg = this->spyCrateFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_VICTIM_TEAM_COLOR_TAG, RenX::getTeamColor(RenX::getEnemy(player.team))); msg.replace(RenX::tags->INTERNAL_VICTIM_TEAM_COLOR_TAG, RenX::getTeamColor(RenX::getEnemy(player.team)));
@ -1788,7 +1788,7 @@ void RenX_LoggingPlugin::RenX_OnRefillCrate(RenX::Server &server, const RenX::Pl
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->refillCrateFmt; Jupiter::String msg = this->refillCrateFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
(server.*func)(msg); (server.*func)(msg);
@ -1804,7 +1804,7 @@ void RenX_LoggingPlugin::RenX_OnTimeBombCrate(RenX::Server &server, const RenX::
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->timeBombCrateFmt; Jupiter::String msg = this->timeBombCrateFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
(server.*func)(msg); (server.*func)(msg);
@ -1820,7 +1820,7 @@ void RenX_LoggingPlugin::RenX_OnSpeedCrate(RenX::Server &server, const RenX::Pla
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->speedCrateFmt; Jupiter::String msg = this->speedCrateFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
(server.*func)(msg); (server.*func)(msg);
@ -1836,7 +1836,7 @@ void RenX_LoggingPlugin::RenX_OnNukeCrate(RenX::Server &server, const RenX::Play
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->nukeCrateFmt; Jupiter::String msg = this->nukeCrateFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
(server.*func)(msg); (server.*func)(msg);
@ -1852,7 +1852,7 @@ void RenX_LoggingPlugin::RenX_OnAbductionCrate(RenX::Server &server, const RenX:
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->abductionCrateFmt; Jupiter::String msg = this->abductionCrateFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
(server.*func)(msg); (server.*func)(msg);
@ -1868,7 +1868,7 @@ void RenX_LoggingPlugin::RenX_OnUnspecifiedCrate(RenX::Server &server, const Ren
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->unspecifiedCrateFmt; Jupiter::String msg = this->unspecifiedCrateFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
(server.*func)(msg); (server.*func)(msg);
@ -1884,7 +1884,7 @@ void RenX_LoggingPlugin::RenX_OnOtherCrate(RenX::Server &server, const RenX::Pla
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->otherCrateFmt; Jupiter::String msg = this->otherCrateFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, type); msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, type);
@ -1901,7 +1901,7 @@ void RenX_LoggingPlugin::RenX_OnSteal(RenX::Server &server, const RenX::PlayerIn
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->stealNoOwnerFmt; Jupiter::String msg = this->stealNoOwnerFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(vehicle)); msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(vehicle));
@ -1918,7 +1918,7 @@ void RenX_LoggingPlugin::RenX_OnSteal(RenX::Server &server, const RenX::PlayerIn
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->stealFmt; Jupiter::String msg = this->stealFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player, &victim); RenX::processTags(msg, &server, &player, &victim);
msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(vehicle)); msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(vehicle));
@ -1935,7 +1935,7 @@ void RenX_LoggingPlugin::RenX_OnDonate(RenX::Server &server, const RenX::PlayerI
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->donateFmt; Jupiter::String msg = this->donateFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &donor, &player); RenX::processTags(msg, &server, &donor, &player);
msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, Jupiter::StringS::Format("%.0f", amount)); msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, Jupiter::StringS::Format("%.0f", amount));
@ -1964,7 +1964,7 @@ void RenX_LoggingPlugin::RenX_OnDestroy(RenX::Server &server, const Jupiter::Rea
msg = this->destroyVehicleFmt2; msg = this->destroyVehicleFmt2;
break; break;
} }
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_NAME_TAG, RenX::translateName(killer)); msg.replace(RenX::tags->INTERNAL_NAME_TAG, RenX::translateName(killer));
@ -2015,7 +2015,7 @@ void RenX_LoggingPlugin::RenX_OnGameOver(RenX::Server &server, RenX::WinType win
else else
msg = this->gameOverFmt; msg = this->gameOverFmt;
if (msg.isNotEmpty() && team != RenX::TeamType::None) if (!msg.empty() && team != RenX::TeamType::None)
{ {
msg.replace(RenX::tags->INTERNAL_TEAM_COLOR_TAG, RenX::getTeamColor(team)); msg.replace(RenX::tags->INTERNAL_TEAM_COLOR_TAG, RenX::getTeamColor(team));
msg.replace(RenX::tags->INTERNAL_TEAM_SHORT_TAG, RenX::getTeamName(team)); msg.replace(RenX::tags->INTERNAL_TEAM_SHORT_TAG, RenX::getTeamName(team));
@ -2032,7 +2032,7 @@ void RenX_LoggingPlugin::RenX_OnGameOver(RenX::Server &server, RenX::WinType win
msg = this->gameOverScoreFmt; msg = this->gameOverScoreFmt;
if (team == RenX::TeamType::None) if (team == RenX::TeamType::None)
{ {
if (msg.isNotEmpty()) if (!msg.empty())
{ {
msg.replace(RenX::tags->INTERNAL_TEAM_COLOR_TAG, RenX::getTeamColor(RenX::TeamType::GDI)); msg.replace(RenX::tags->INTERNAL_TEAM_COLOR_TAG, RenX::getTeamColor(RenX::TeamType::GDI));
msg.replace(RenX::tags->INTERNAL_TEAM_SHORT_TAG, RenX::getTeamName(RenX::TeamType::GDI)); msg.replace(RenX::tags->INTERNAL_TEAM_SHORT_TAG, RenX::getTeamName(RenX::TeamType::GDI));
@ -2046,7 +2046,7 @@ void RenX_LoggingPlugin::RenX_OnGameOver(RenX::Server &server, RenX::WinType win
(server.*func)(msg); (server.*func)(msg);
} }
} }
else if (msg.isNotEmpty()) else if (!msg.empty())
{ {
msg.replace(RenX::tags->INTERNAL_TEAM_COLOR_TAG, RenX::getTeamColor(team)); msg.replace(RenX::tags->INTERNAL_TEAM_COLOR_TAG, RenX::getTeamColor(team));
msg.replace(RenX::tags->INTERNAL_TEAM_SHORT_TAG, RenX::getTeamName(team)); msg.replace(RenX::tags->INTERNAL_TEAM_SHORT_TAG, RenX::getTeamName(team));
@ -2070,7 +2070,7 @@ void RenX_LoggingPlugin::RenX_OnGame(RenX::Server &server, const Jupiter::Readab
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->gameFmt; Jupiter::String msg = this->gameFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw);
@ -2092,7 +2092,7 @@ void RenX_LoggingPlugin::RenX_OnExecute(RenX::Server &server, const Jupiter::Rea
else else
msg = this->executeFmt; msg = this->executeFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_NAME_TAG, user); msg.replace(RenX::tags->INTERNAL_NAME_TAG, user);
@ -2111,7 +2111,7 @@ void RenX_LoggingPlugin::RenX_OnSubscribe(RenX::Server &server, const Jupiter::R
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->subscribeFmt; Jupiter::String msg = this->subscribeFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_NAME_TAG, user); msg.replace(RenX::tags->INTERNAL_NAME_TAG, user);
@ -2128,7 +2128,7 @@ void RenX_LoggingPlugin::RenX_OnRCON(RenX::Server &server, const Jupiter::Readab
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->rconFmt; Jupiter::String msg = this->rconFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw);
@ -2145,7 +2145,7 @@ void RenX_LoggingPlugin::RenX_OnAdminLogin(RenX::Server &server, const RenX::Pla
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->adminLoginFmt; Jupiter::String msg = this->adminLoginFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
(server.*func)(msg); (server.*func)(msg);
@ -2161,7 +2161,7 @@ void RenX_LoggingPlugin::RenX_OnAdminGrant(RenX::Server &server, const RenX::Pla
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->adminGrantFmt; Jupiter::String msg = this->adminGrantFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
(server.*func)(msg); (server.*func)(msg);
@ -2177,7 +2177,7 @@ void RenX_LoggingPlugin::RenX_OnAdminLogout(RenX::Server &server, const RenX::Pl
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->adminLogoutFmt; Jupiter::String msg = this->adminLogoutFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
(server.*func)(msg); (server.*func)(msg);
@ -2193,7 +2193,7 @@ void RenX_LoggingPlugin::RenX_OnAdmin(RenX::Server &server, const Jupiter::Reada
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->adminFmt; Jupiter::String msg = this->adminFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw);
@ -2210,7 +2210,7 @@ void RenX_LoggingPlugin::RenX_OnVoteAddBots(RenX::Server &server, const RenX::Te
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->voteAddBotsFmt; Jupiter::String msg = this->voteAddBotsFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_VICTIM_TEAM_COLOR_TAG, RenX::getTeamColor(victim)); msg.replace(RenX::tags->INTERNAL_VICTIM_TEAM_COLOR_TAG, RenX::getTeamColor(victim));
@ -2231,7 +2231,7 @@ void RenX_LoggingPlugin::RenX_OnVoteChangeMap(RenX::Server &server, const RenX::
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->voteChangeMapFmt; Jupiter::String msg = this->voteChangeMapFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_VICTIM_TEAM_COLOR_TAG, RenX::getTeamColor(team)); msg.replace(RenX::tags->INTERNAL_VICTIM_TEAM_COLOR_TAG, RenX::getTeamColor(team));
@ -2250,7 +2250,7 @@ void RenX_LoggingPlugin::RenX_OnVoteKick(RenX::Server &server, const RenX::TeamT
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->voteKickFmt; Jupiter::String msg = this->voteKickFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player, &victim); RenX::processTags(msg, &server, &player, &victim);
(server.*func)(msg); (server.*func)(msg);
@ -2266,7 +2266,7 @@ void RenX_LoggingPlugin::RenX_OnVoteMineBan(RenX::Server &server, const RenX::Te
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->voteMineBanFmt; Jupiter::String msg = this->voteMineBanFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player, &victim); RenX::processTags(msg, &server, &player, &victim);
(server.*func)(msg); (server.*func)(msg);
@ -2282,7 +2282,7 @@ void RenX_LoggingPlugin::RenX_OnVoteRemoveBots(RenX::Server &server, const RenX:
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->voteRemoveBotsFmt; Jupiter::String msg = this->voteRemoveBotsFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_VICTIM_TEAM_COLOR_TAG, RenX::getTeamColor(victim)); msg.replace(RenX::tags->INTERNAL_VICTIM_TEAM_COLOR_TAG, RenX::getTeamColor(victim));
@ -2302,7 +2302,7 @@ void RenX_LoggingPlugin::RenX_OnVoteRestartMap(RenX::Server &server, const RenX:
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->voteRestartMapFmt; Jupiter::String msg = this->voteRestartMapFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_VICTIM_TEAM_COLOR_TAG, RenX::getTeamColor(team)); msg.replace(RenX::tags->INTERNAL_VICTIM_TEAM_COLOR_TAG, RenX::getTeamColor(team));
@ -2321,7 +2321,7 @@ void RenX_LoggingPlugin::RenX_OnVoteSurrender(RenX::Server &server, const RenX::
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->voteSurrenderFmt; Jupiter::String msg = this->voteSurrenderFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_VICTIM_TEAM_COLOR_TAG, RenX::getTeamColor(team)); msg.replace(RenX::tags->INTERNAL_VICTIM_TEAM_COLOR_TAG, RenX::getTeamColor(team));
@ -2340,7 +2340,7 @@ void RenX_LoggingPlugin::RenX_OnVoteSurvey(RenX::Server &server, const RenX::Tea
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->voteSurveyFmt; Jupiter::String msg = this->voteSurveyFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_VICTIM_TEAM_COLOR_TAG, RenX::getTeamColor(team)); msg.replace(RenX::tags->INTERNAL_VICTIM_TEAM_COLOR_TAG, RenX::getTeamColor(team));
@ -2360,7 +2360,7 @@ void RenX_LoggingPlugin::RenX_OnVoteOther(RenX::Server &server, const RenX::Team
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->voteOtherFmt; Jupiter::String msg = this->voteOtherFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
msg.replace(RenX::tags->INTERNAL_VICTIM_TEAM_COLOR_TAG, RenX::getTeamColor(team)); msg.replace(RenX::tags->INTERNAL_VICTIM_TEAM_COLOR_TAG, RenX::getTeamColor(team));
@ -2380,7 +2380,7 @@ void RenX_LoggingPlugin::RenX_OnVoteOver(RenX::Server &server, const RenX::TeamT
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = success ? this->voteOverSuccessFmt : this->voteOverFailFmt; Jupiter::String msg = success ? this->voteOverSuccessFmt : this->voteOverFailFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(type)); msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(type));
@ -2405,7 +2405,7 @@ void RenX_LoggingPlugin::RenX_OnVoteCancel(RenX::Server &server, const RenX::Tea
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->voteCancelFmt; Jupiter::String msg = this->voteCancelFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(type)); msg.replace(RenX::tags->INTERNAL_OBJECT_TAG, RenX::translateName(type));
@ -2428,7 +2428,7 @@ void RenX_LoggingPlugin::RenX_OnVote(RenX::Server &server, const Jupiter::Readab
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->voteFmt; Jupiter::String msg = this->voteFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw);
@ -2445,7 +2445,7 @@ void RenX_LoggingPlugin::RenX_OnMapChange(RenX::Server &server, const Jupiter::R
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->mapChangeFmt; Jupiter::String msg = this->mapChangeFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, map); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, map);
@ -2462,7 +2462,7 @@ void RenX_LoggingPlugin::RenX_OnMapLoad(RenX::Server &server, const Jupiter::Rea
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->mapLoadFmt; Jupiter::String msg = this->mapLoadFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, map); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, map);
@ -2479,7 +2479,7 @@ void RenX_LoggingPlugin::RenX_OnMapStart(RenX::Server &server, const Jupiter::Re
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->mapStartFmt; Jupiter::String msg = this->mapStartFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, map); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, map);
@ -2496,7 +2496,7 @@ void RenX_LoggingPlugin::RenX_OnMap(RenX::Server &server, const Jupiter::Readabl
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->mapFmt; Jupiter::String msg = this->mapFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw);
@ -2513,7 +2513,7 @@ void RenX_LoggingPlugin::RenX_OnDemoRecord(RenX::Server &server, const RenX::Pla
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->demoRecordFmt; Jupiter::String msg = this->demoRecordFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server, &player); RenX::processTags(msg, &server, &player);
(server.*func)(msg); (server.*func)(msg);
@ -2529,7 +2529,7 @@ void RenX_LoggingPlugin::RenX_OnDemoRecord(RenX::Server &server, const Jupiter::
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->rconDemoRecordFmt; Jupiter::String msg = this->rconDemoRecordFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->nameTag, user); msg.replace(RenX::tags->nameTag, user);
@ -2546,7 +2546,7 @@ void RenX_LoggingPlugin::RenX_OnDemoRecordStop(RenX::Server &server)
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->demoRecordStopFmt; Jupiter::String msg = this->demoRecordStopFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
(server.*func)(msg); (server.*func)(msg);
@ -2562,7 +2562,7 @@ void RenX_LoggingPlugin::RenX_OnDemo(RenX::Server &server, const Jupiter::Readab
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->demoFmt; Jupiter::String msg = this->demoFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw);
@ -2579,7 +2579,7 @@ void RenX_LoggingPlugin::RenX_OnLog(RenX::Server &server, const Jupiter::Readabl
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->logFmt; Jupiter::String msg = this->logFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw);
@ -2596,7 +2596,7 @@ void RenX_LoggingPlugin::RenX_OnCommand(RenX::Server &server, const Jupiter::Rea
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->commandFmt; Jupiter::String msg = this->commandFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw);
@ -2613,7 +2613,7 @@ void RenX_LoggingPlugin::RenX_OnError(RenX::Server &server, const Jupiter::Reada
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->errorFmt; Jupiter::String msg = this->errorFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw);
@ -2630,7 +2630,7 @@ void RenX_LoggingPlugin::RenX_OnVersion(RenX::Server &server, const Jupiter::Rea
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->versionFmt; Jupiter::String msg = this->versionFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw);
@ -2647,7 +2647,7 @@ void RenX_LoggingPlugin::RenX_OnAuthorized(RenX::Server &server, const Jupiter::
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->authorizedFmt; Jupiter::String msg = this->authorizedFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw);
@ -2664,7 +2664,7 @@ void RenX_LoggingPlugin::RenX_OnOther(RenX::Server &server, char token, const Ju
func = &RenX::Server::sendAdmChan; func = &RenX::Server::sendAdmChan;
Jupiter::String msg = this->otherFmt; Jupiter::String msg = this->otherFmt;
if (msg.isNotEmpty()) if (!msg.empty())
{ {
RenX::processTags(msg, &server); RenX::processTags(msg, &server);
msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw); msg.replace(RenX::tags->INTERNAL_MESSAGE_TAG, raw);

2
src/Plugins/RenX/RenX.Medals/RenX_Medals.cpp

@ -295,7 +295,7 @@ void RecsGameCommand::create()
void RecsGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters) void RecsGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
RenX::PlayerInfo *target = source->getPlayerByPartName(parameters); RenX::PlayerInfo *target = source->getPlayerByPartName(parameters);
if (target == nullptr) if (target == nullptr)

10
src/Plugins/RenX/RenX.ModSystem/RenX_ModSystem.cpp

@ -433,7 +433,7 @@ void AuthIRCCommand::create()
void AuthIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void AuthIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
Jupiter::IRC::Client::Channel *chan = source->getChannel(channel); Jupiter::IRC::Client::Channel *chan = source->getChannel(channel);
if (chan != nullptr) if (chan != nullptr)
@ -503,7 +503,7 @@ void DeAuthIRCCommand::create()
void DeAuthIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void DeAuthIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
Jupiter::IRC::Client::Channel *chan = source->getChannel(channel); Jupiter::IRC::Client::Channel *chan = source->getChannel(channel);
if (chan != nullptr) if (chan != nullptr)
@ -795,7 +795,7 @@ void ForceAuthIRCCommand::create()
void ForceAuthIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void ForceAuthIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
Jupiter::IRC::Client::Channel *chan = source->getChannel(channel); Jupiter::IRC::Client::Channel *chan = source->getChannel(channel);
if (chan != nullptr) if (chan != nullptr)
@ -909,7 +909,7 @@ void AuthGameCommand::create()
void AuthGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters) void AuthGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
RenX::PlayerInfo *target = source->getPlayerByPartName(parameters); RenX::PlayerInfo *target = source->getPlayerByPartName(parameters);
if (target == nullptr) if (target == nullptr)
@ -1021,7 +1021,7 @@ void ForceAuthGameCommand::create()
void ForceAuthGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters) void ForceAuthGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
RenX::PlayerInfo *target = source->getPlayerByPartName(parameters); RenX::PlayerInfo *target = source->getPlayerByPartName(parameters);
if (target == nullptr) if (target == nullptr)

2
src/Plugins/RenX/RenX.Warn/RenX_Warn.cpp

@ -211,7 +211,7 @@ void PardonGameCommand::create() {
} }
void PardonGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters) { void PardonGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, const Jupiter::ReadableString &parameters) {
if (parameters.isNotEmpty()) { if (!parameters.empty()) {
RenX::PlayerInfo *target = source->getPlayerByPartName(parameters); RenX::PlayerInfo *target = source->getPlayerByPartName(parameters);
if (target != nullptr) { if (target != nullptr) {
target->varData[pluginInstance.getName()].remove(WARNS_KEY); target->varData[pluginInstance.getName()].remove(WARNS_KEY);

2
src/Plugins/SetJoin/SetJoin.cpp

@ -43,7 +43,7 @@ void SetJoinIRCCommand::create()
void SetJoinIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void SetJoinIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
if (parameters.isNotEmpty()) if (!parameters.empty())
{ {
pluginInstance.setjoin_file[source->getConfigSection()].set(nick, static_cast<std::string>(parameters)); pluginInstance.setjoin_file[source->getConfigSection()].set(nick, static_cast<std::string>(parameters));
pluginInstance.setjoin_file.write(); pluginInstance.setjoin_file.write();

Loading…
Cancel
Save