Browse Source

Reverted previous two commits; updated Jupiter (better fix).

pull/3/head
JustinAJ 9 years ago
parent
commit
eb98dd9139
  1. 2
      Jupiter
  2. BIN
      Release/Bot.lib
  3. BIN
      Release/Plugins/RenX.Core.lib
  4. 6
      RenX.Core/RenX_Server.cpp

2
Jupiter

@ -1 +1 @@
Subproject commit b8bd29d055b995835c3deb4530a23a559ae91ac0 Subproject commit 4d20ab64300ba49a923c712106dd2a040fa95bcc

BIN
Release/Bot.lib

Binary file not shown.

BIN
Release/Plugins/RenX.Core.lib

Binary file not shown.

6
RenX.Core/RenX_Server.cpp

@ -189,7 +189,7 @@ bool RenX::Server::isPure() const
int RenX::Server::send(const Jupiter::ReadableString &command) int RenX::Server::send(const Jupiter::ReadableString &command)
{ {
return RenX::Server::sock.send("c"_jrs + command + "\n"_jrs); return RenX::Server::sock.send("c"_jrs + command + '\n');
} }
int RenX::Server::sendMessage(const Jupiter::ReadableString &message) int RenX::Server::sendMessage(const Jupiter::ReadableString &message)
@ -204,12 +204,12 @@ int RenX::Server::sendMessage(const Jupiter::ReadableString &message)
return r; return r;
} }
else else
return RenX::Server::sock.send("chostsay "_jrs + message + "\n"_jrs); return RenX::Server::sock.send("chostsay "_jrs + message + '\n');
} }
int RenX::Server::sendMessage(const RenX::PlayerInfo *player, const Jupiter::ReadableString &message) int RenX::Server::sendMessage(const RenX::PlayerInfo *player, const Jupiter::ReadableString &message)
{ {
auto cmd = "chostprivatesay pid"_jrs + Jupiter::StringS::Format("%d ", player->id) + message + "\n"_jrs; auto cmd = "chostprivatesay pid"_jrs + Jupiter::StringS::Format("%d ", player->id) + message + '\n';
RenX::sanitizeString(cmd); RenX::sanitizeString(cmd);
return RenX::Server::sock.send(cmd); return RenX::Server::sock.send(cmd);
} }

Loading…
Cancel
Save