|
@ -590,7 +590,7 @@ void RenX::Server::sendPubChan(const char *fmt, ...) const |
|
|
va_list args; |
|
|
va_list args; |
|
|
va_start(args, fmt); |
|
|
va_start(args, fmt); |
|
|
Jupiter::StringL msg; |
|
|
Jupiter::StringL msg; |
|
|
const Jupiter::ReadableString &serverPrefix = RenX::Server::IRCPrefix; |
|
|
const Jupiter::ReadableString &serverPrefix = RenX::Server::getPrefix(); |
|
|
if (serverPrefix.isEmpty() == false) |
|
|
if (serverPrefix.isEmpty() == false) |
|
|
{ |
|
|
{ |
|
|
msg += serverPrefix; |
|
|
msg += serverPrefix; |
|
@ -599,11 +599,23 @@ void RenX::Server::sendPubChan(const char *fmt, ...) const |
|
|
} |
|
|
} |
|
|
else msg.vformat(fmt, args); |
|
|
else msg.vformat(fmt, args); |
|
|
va_end(args); |
|
|
va_end(args); |
|
|
RenX::Server::sendPubChan(msg); |
|
|
for (size_t i = 0; i != serverManager->size(); i++) |
|
|
|
|
|
serverManager->getServer(i)->messageChannels(RenX::Server::logChanType, msg); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void RenX::Server::sendPubChan(const Jupiter::ReadableString &msg) const |
|
|
void RenX::Server::sendPubChan(const Jupiter::ReadableString &msg) const |
|
|
{ |
|
|
{ |
|
|
|
|
|
const Jupiter::ReadableString &prefix = this->getPrefix(); |
|
|
|
|
|
if (prefix.isEmpty() == false) |
|
|
|
|
|
{ |
|
|
|
|
|
Jupiter::String m(msg.size() + prefix.size() + 1); |
|
|
|
|
|
m.set(prefix); |
|
|
|
|
|
m += ' '; |
|
|
|
|
|
m += msg; |
|
|
|
|
|
for (size_t i = 0; i != serverManager->size(); i++) |
|
|
|
|
|
serverManager->getServer(i)->messageChannels(RenX::Server::logChanType, m); |
|
|
|
|
|
} |
|
|
|
|
|
else |
|
|
for (size_t i = 0; i != serverManager->size(); i++) |
|
|
for (size_t i = 0; i != serverManager->size(); i++) |
|
|
serverManager->getServer(i)->messageChannels(RenX::Server::logChanType, msg); |
|
|
serverManager->getServer(i)->messageChannels(RenX::Server::logChanType, msg); |
|
|
} |
|
|
} |
|
@ -622,17 +634,30 @@ void RenX::Server::sendAdmChan(const char *fmt, ...) const |
|
|
} |
|
|
} |
|
|
else msg.vformat(fmt, args); |
|
|
else msg.vformat(fmt, args); |
|
|
va_end(args); |
|
|
va_end(args); |
|
|
RenX::Server::sendAdmChan(msg); |
|
|
for (size_t i = 0; i != serverManager->size(); i++) |
|
|
|
|
|
serverManager->getServer(i)->messageChannels(RenX::Server::adminLogChanType, msg); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void RenX::Server::sendAdmChan(const Jupiter::ReadableString &msg) const |
|
|
void RenX::Server::sendAdmChan(const Jupiter::ReadableString &msg) const |
|
|
{ |
|
|
{ |
|
|
|
|
|
const Jupiter::ReadableString &prefix = this->getPrefix(); |
|
|
|
|
|
if (prefix.isEmpty() == false) |
|
|
|
|
|
{ |
|
|
|
|
|
Jupiter::String m(msg.size() + prefix.size() + 1); |
|
|
|
|
|
m.set(prefix); |
|
|
|
|
|
m += ' '; |
|
|
|
|
|
m += msg; |
|
|
|
|
|
for (size_t i = 0; i != serverManager->size(); i++) |
|
|
|
|
|
serverManager->getServer(i)->messageChannels(RenX::Server::adminLogChanType, m); |
|
|
|
|
|
} |
|
|
|
|
|
else |
|
|
for (size_t i = 0; i != serverManager->size(); i++) |
|
|
for (size_t i = 0; i != serverManager->size(); i++) |
|
|
serverManager->getServer(i)->messageChannels(RenX::Server::adminLogChanType, msg); |
|
|
serverManager->getServer(i)->messageChannels(RenX::Server::adminLogChanType, msg); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void RenX::Server::sendLogChan(const char *fmt, ...) const |
|
|
void RenX::Server::sendLogChan(const char *fmt, ...) const |
|
|
{ |
|
|
{ |
|
|
|
|
|
IRC_Bot *server; |
|
|
va_list args; |
|
|
va_list args; |
|
|
va_start(args, fmt); |
|
|
va_start(args, fmt); |
|
|
Jupiter::StringL msg; |
|
|
Jupiter::StringL msg; |
|
@ -645,14 +670,35 @@ void RenX::Server::sendLogChan(const char *fmt, ...) const |
|
|
} |
|
|
} |
|
|
else msg.vformat(fmt, args); |
|
|
else msg.vformat(fmt, args); |
|
|
va_end(args); |
|
|
va_end(args); |
|
|
RenX::Server::sendLogChan(msg); |
|
|
for (size_t i = 0; i != serverManager->size(); i++) |
|
|
|
|
|
{ |
|
|
|
|
|
server = serverManager->getServer(i); |
|
|
|
|
|
server->messageChannels(RenX::Server::logChanType, msg); |
|
|
|
|
|
server->messageChannels(RenX::Server::adminLogChanType, msg); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void RenX::Server::sendLogChan(const Jupiter::ReadableString &msg) const |
|
|
void RenX::Server::sendLogChan(const Jupiter::ReadableString &msg) const |
|
|
{ |
|
|
{ |
|
|
|
|
|
IRC_Bot *server; |
|
|
|
|
|
const Jupiter::ReadableString &prefix = this->getPrefix(); |
|
|
|
|
|
if (prefix.isEmpty() == false) |
|
|
|
|
|
{ |
|
|
|
|
|
Jupiter::String m(msg.size() + prefix.size() + 1); |
|
|
|
|
|
m.set(prefix); |
|
|
|
|
|
m += ' '; |
|
|
|
|
|
m += msg; |
|
|
for (size_t i = 0; i != serverManager->size(); i++) |
|
|
for (size_t i = 0; i != serverManager->size(); i++) |
|
|
{ |
|
|
{ |
|
|
IRC_Bot *server = serverManager->getServer(i); |
|
|
server = serverManager->getServer(i); |
|
|
|
|
|
server->messageChannels(RenX::Server::logChanType, m); |
|
|
|
|
|
server->messageChannels(RenX::Server::adminLogChanType, m); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
else |
|
|
|
|
|
for (size_t i = 0; i != serverManager->size(); i++) |
|
|
|
|
|
{ |
|
|
|
|
|
server = serverManager->getServer(i); |
|
|
server->messageChannels(RenX::Server::logChanType, msg); |
|
|
server->messageChannels(RenX::Server::logChanType, msg); |
|
|
server->messageChannels(RenX::Server::adminLogChanType, msg); |
|
|
server->messageChannels(RenX::Server::adminLogChanType, msg); |
|
|
} |
|
|
} |
|
@ -1612,6 +1658,18 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) |
|
|
player->name = newName; |
|
|
player->name = newName; |
|
|
onAction(); |
|
|
onAction(); |
|
|
} |
|
|
} |
|
|
|
|
|
else if (subHeader.equals("ChangeID;")) |
|
|
|
|
|
{ |
|
|
|
|
|
// "to" | New ID | "from" | Old ID
|
|
|
|
|
|
int oldID = buff.getToken(5, RenX::DelimC).asInt(); |
|
|
|
|
|
RenX::PlayerInfo *player = this->getPlayer(oldID); |
|
|
|
|
|
if (player != nullptr) |
|
|
|
|
|
{ |
|
|
|
|
|
player->id = buff.getToken(3, RenX::DelimC).asInt(); |
|
|
|
|
|
for (size_t i = 0; i < xPlugins.size(); i++) |
|
|
|
|
|
xPlugins.get(i)->RenX_OnIDChange(this, player, oldID); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
Jupiter::ReferenceString raw = buff.gotoToken(1, RenX::DelimC); |
|
|
Jupiter::ReferenceString raw = buff.gotoToken(1, RenX::DelimC); |
|
|