jessica
/
Jupiter-Bot
mirror of https://github.com/JAJames/Jupiter-Bot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Changed asUnsignedInt calls to asUnsignedLongLong. Changed steamid output format to capitalized hex to better match previous output.

pull/3/head
JustinAJ 10 years ago
parent
179e1eee5b
commit
e48f6d6af2
8 changed files with 14 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      Release/Bot.lib
  2. BIN
      Release/Plugins/RenX.Core.lib
  3. 4
      RenX.Commands/RenX_Commands.cpp
  4. 8
      RenX.Core/RenX_Server.cpp
  5. 2
      RenX.ExcessiveHeadshots/ExcessiveHeadshots.cpp
  6. 2
      RenX.Logging/RenX_Logging.cpp
  7. 4
      RenX.Medals/RenX_Medals.cpp
  8. 8
      RenX.SetJoin/RenX_SetJoin.cpp

BIN
Release/Bot.lib
View File

Binary file not shown.

BIN
Release/Plugins/RenX.Core.lib
View File

Binary file not shown.

4
RenX.Commands/RenX_Commands.cpp
View File

@ -355,7 +355,7 @@ void PlayerInfoIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableStrin
else msg += "IP Not Found" IRCBOLD; else msg += "IP Not Found" IRCBOLD;
} }
if (player->steamid != 0) if (player->steamid != 0)
msg.aformat(" - Steam ID: " IRCBOLD "0x%.16llx" IRCBOLD, player->steamid); msg.aformat(" - Steam ID: " IRCBOLD "0x%.16llX" IRCBOLD, player->steamid);
if (player->adminType.size() != 0) if (player->adminType.size() != 0)
{ {
msg += " - Admin Type: " IRCBOLD; msg += " - Admin Type: " IRCBOLD;
@ -412,7 +412,7 @@ void SteamIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &ch
Jupiter::String &playerName = RenX::getFormattedPlayerName(player); Jupiter::String &playerName = RenX::getFormattedPlayerName(player);
msg.format(IRCCOLOR "03[Steam] " IRCCOLOR "%.*s (ID: %d) ", playerName.size(), playerName.ptr(), player->id); msg.format(IRCCOLOR "03[Steam] " IRCCOLOR "%.*s (ID: %d) ", playerName.size(), playerName.ptr(), player->id);
if (player->steamid != 0) if (player->steamid != 0)
msg.aformat("is using steam ID " IRCBOLD "0x%.16llx" IRCBOLD, player->steamid); msg.aformat("is using steam ID " IRCBOLD "0x%.16llX" IRCBOLD, player->steamid);
else msg += "is not using steam."; else msg += "is not using steam.";
source->sendMessage(channel, msg); source->sendMessage(channel, msg);
} }

8
RenX.Core/RenX_Server.cpp
View File

@ -682,14 +682,14 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line)
{ {
player->ip = buff.getWord(3, RenX::DelimS); player->ip = buff.getWord(3, RenX::DelimS);
if (buff.getWord(4, RenX::DelimS).equals("steamid")) if (buff.getWord(4, RenX::DelimS).equals("steamid"))
player->steamid = buff.getWord(5, RenX::DelimS).asUnsignedInt(); player->steamid = buff.getWord(5, RenX::DelimS).asUnsignedLongLong();
switch (RenX::Server::uuidMode) switch (RenX::Server::uuidMode)
{ {
default: default:
case 0: case 0:
if (player->steamid != 0) if (player->steamid != 0)
player->uuid.format("0x%.16llx", player->steamid); player->uuid.format("0x%.16llX", player->steamid);
break; break;
case 1: case 1:
player->uuid = player->name; player->uuid = player->name;
@ -785,14 +785,14 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line)
if (player->ip.size() == 0) if (player->ip.size() == 0)
{ {
player->ip = ip; player->ip = ip;
player->steamid = steamid.asUnsignedInt(); player->steamid = steamid.asUnsignedLongLong();
switch (RenX::Server::uuidMode) switch (RenX::Server::uuidMode)
{ {
default: default:
case 0: case 0:
if (player->steamid != 0) if (player->steamid != 0)
player->uuid.format("0x%.16llx", player->steamid); player->uuid.format("0x%.16llX", player->steamid);
break; break;
case 1: case 1:
player->uuid = player->name; player->uuid = player->name;

2
RenX.ExcessiveHeadshots/ExcessiveHeadshots.cpp
View File

@ -55,7 +55,7 @@ void RenX_ExcessiveHeadshotsPlugin::RenX_OnKill(RenX::Server *server, const RenX
{ {
server->kickPlayer(player); server->kickPlayer(player);
server->sendPubChan(IRCCOLOR "13[Aimbot]" IRCCOLOR " %.*s was banned from the server! Kills: %u - Deaths: %u - Headshots: %u", player->name.size(), player->name.ptr(), player->kills, player->deaths, player->headshots); server->sendPubChan(IRCCOLOR "13[Aimbot]" IRCCOLOR " %.*s was banned from the server! Kills: %u - Deaths: %u - Headshots: %u", player->name.size(), player->name.ptr(), player->kills, player->deaths, player->headshots);
server->sendAdmChan(IRCCOLOR "13[Aimbot]" IRCCOLOR " %.*s was banned from the server! Kills: %u - Deaths: %u - Headshots: %u - IP: " IRCBOLD "%.*s" IRCBOLD " - Steam ID: " IRCBOLD "0x%.16llx" IRCBOLD, player->name.size(), player->name.ptr(), player->kills, player->deaths, player->headshots, player->ip.size(), player->ip.ptr(), player->steamid); server->sendAdmChan(IRCCOLOR "13[Aimbot]" IRCCOLOR " %.*s was banned from the server! Kills: %u - Deaths: %u - Headshots: %u - IP: " IRCBOLD "%.*s" IRCBOLD " - Steam ID: " IRCBOLD "0x%.16llX" IRCBOLD, player->name.size(), player->name.ptr(), player->kills, player->deaths, player->headshots, player->ip.size(), player->ip.ptr(), player->steamid);
} }
} }
} }

2
RenX.Logging/RenX_Logging.cpp
View File

@ -63,7 +63,7 @@ void RenX_LoggingPlugin::RenX_OnJoin(RenX::Server *server, const RenX::PlayerInf
if (player->steamid == 0) if (player->steamid == 0)
server->sendAdmChan(IRCCOLOR "12[Join]" IRCCOLOR "%.*s " IRCBOLD "%.*s" IRCBOLD " joined the game fighting for the %.*s from " IRCBOLD "%.*s" IRCBOLD ", but is not using Steam.", teamColor.size(), teamColor.ptr(), player->name.size(), player->name.ptr(), teamName.size(), teamName.ptr(), player->ip.size(), player->ip.ptr()); server->sendAdmChan(IRCCOLOR "12[Join]" IRCCOLOR "%.*s " IRCBOLD "%.*s" IRCBOLD " joined the game fighting for the %.*s from " IRCBOLD "%.*s" IRCBOLD ", but is not using Steam.", teamColor.size(), teamColor.ptr(), player->name.size(), player->name.ptr(), teamName.size(), teamName.ptr(), player->ip.size(), player->ip.ptr());
else else
server->sendAdmChan(IRCCOLOR "12[Join]" IRCCOLOR "%.*s " IRCBOLD "%.*s" IRCBOLD " joined the game fighting for the %.*s from " IRCBOLD "%.*s" IRCBOLD " using Steam ID " IRCBOLD "0x%.16llx" IRCBOLD ".", teamColor.size(), teamColor.ptr(), player->name.size(), player->name.ptr(), teamName.size(), teamName.ptr(), player->ip.size(), player->ip.ptr(), player->steamid); server->sendAdmChan(IRCCOLOR "12[Join]" IRCCOLOR "%.*s " IRCBOLD "%.*s" IRCBOLD " joined the game fighting for the %.*s from " IRCBOLD "%.*s" IRCBOLD " using Steam ID " IRCBOLD "0x%.16llX" IRCBOLD ".", teamColor.size(), teamColor.ptr(), player->name.size(), player->name.ptr(), teamName.size(), teamName.ptr(), player->ip.size(), player->ip.ptr(), player->steamid);
} }
void RenX_LoggingPlugin::RenX_OnPart(RenX::Server *server, const RenX::PlayerInfo *player) void RenX_LoggingPlugin::RenX_OnPart(RenX::Server *server, const RenX::PlayerInfo *player)

4
RenX.Medals/RenX_Medals.cpp
View File

@ -38,8 +38,8 @@ struct MedalPlayerData
MedalPlayerData::uuid = id; MedalPlayerData::uuid = id;
if (medalsFile.getSectionIndex(MedalPlayerData::uuid) != Jupiter::INVALID_INDEX) if (medalsFile.getSectionIndex(MedalPlayerData::uuid) != Jupiter::INVALID_INDEX)
{ {
MedalPlayerData::recs = medalsFile.get(MedalPlayerData::uuid, STRING_LITERAL_AS_REFERENCE("Recs")).asUnsignedInt(10); MedalPlayerData::recs = medalsFile.get(MedalPlayerData::uuid, STRING_LITERAL_AS_REFERENCE("Recs")).asUnsignedLongLong(10);
MedalPlayerData::noobs = medalsFile.get(MedalPlayerData::uuid, STRING_LITERAL_AS_REFERENCE("Noobs")).asUnsignedInt(10); MedalPlayerData::noobs = medalsFile.get(MedalPlayerData::uuid, STRING_LITERAL_AS_REFERENCE("Noobs")).asUnsignedLongLong(10);
MedalPlayerData::lastName = medalsFile.get(MedalPlayerData::uuid, STRING_LITERAL_AS_REFERENCE("Name")); MedalPlayerData::lastName = medalsFile.get(MedalPlayerData::uuid, STRING_LITERAL_AS_REFERENCE("Name"));
MedalPlayerData::lastSeen = medalsFile.getInt(MedalPlayerData::uuid, STRING_LITERAL_AS_REFERENCE("Seen")); MedalPlayerData::lastSeen = medalsFile.getInt(MedalPlayerData::uuid, STRING_LITERAL_AS_REFERENCE("Seen"));
} }

8
RenX.SetJoin/RenX_SetJoin.cpp
View File

@ -27,7 +27,7 @@ void RenX_SetJoinPlugin::RenX_OnJoin(RenX::Server *server, const RenX::PlayerInf
{ {
if (player->steamid != 0) if (player->steamid != 0)
{ {
const Jupiter::ReadableString &setjoin = Jupiter::IRC::Client::Config->get(configSection, Jupiter::StringS::Format("0x%.16llx", player->steamid)); const Jupiter::ReadableString &setjoin = Jupiter::IRC::Client::Config->get(configSection, Jupiter::StringS::Format("0x%.16llX", player->steamid));
if (setjoin.isEmpty() == false) if (setjoin.isEmpty() == false)
server->sendMessage(Jupiter::StringS::Format("[%.*s] %.*s", player->name.size(), player->name.ptr(), setjoin.size(), setjoin.ptr())); server->sendMessage(Jupiter::StringS::Format("[%.*s] %.*s", player->name.size(), player->name.ptr(), setjoin.size(), setjoin.ptr()));
} }
@ -45,7 +45,7 @@ void ViewJoinGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player
{ {
if (player->steamid != 0) if (player->steamid != 0)
{ {
const Jupiter::ReadableString &setjoin = Jupiter::IRC::Client::Config->get(configSection, Jupiter::StringS::Format("0x%.16llx", player->steamid)); const Jupiter::ReadableString &setjoin = Jupiter::IRC::Client::Config->get(configSection, Jupiter::StringS::Format("0x%.16llX", player->steamid));
if (setjoin.isEmpty() == false) if (setjoin.isEmpty() == false)
source->sendMessage(Jupiter::StringS::Format("[%.*s] %.*s", player->name.size(), player->name.ptr(), setjoin.size(), setjoin.ptr())); source->sendMessage(Jupiter::StringS::Format("[%.*s] %.*s", player->name.size(), player->name.ptr(), setjoin.size(), setjoin.ptr()));
else source->sendMessage(player, STRING_LITERAL_AS_REFERENCE("Error: No setjoin found.")); else source->sendMessage(player, STRING_LITERAL_AS_REFERENCE("Error: No setjoin found."));
@ -75,7 +75,7 @@ void DelJoinGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player,
{ {
if (player->steamid != 0) if (player->steamid != 0)
{ {
if (Jupiter::IRC::Client::Config->remove(configSection, Jupiter::StringS::Format("0x%.16llx", player->steamid))) if (Jupiter::IRC::Client::Config->remove(configSection, Jupiter::StringS::Format("0x%.16llX", player->steamid)))
source->sendMessage(player, Jupiter::StringS::Format("%.*s, your join message has been removed.", player->name.size(), player->name.ptr())); source->sendMessage(player, Jupiter::StringS::Format("%.*s, your join message has been removed.", player->name.size(), player->name.ptr()));
else source->sendMessage(player, STRING_LITERAL_AS_REFERENCE("Error: Setjoin not found.")); else source->sendMessage(player, STRING_LITERAL_AS_REFERENCE("Error: Setjoin not found."));
} }
@ -104,7 +104,7 @@ void SetJoinGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player,
{ {
if (parameters.isEmpty() == false) if (parameters.isEmpty() == false)
{ {
Jupiter::IRC::Client::Config->set(configSection, Jupiter::StringS::Format("0x%.16llx", player->steamid), parameters); Jupiter::IRC::Client::Config->set(configSection, Jupiter::StringS::Format("0x%.16llX", player->steamid), parameters);
Jupiter::IRC::Client::Config->sync(); Jupiter::IRC::Client::Config->sync();
source->sendMessage(player, Jupiter::StringS::Format("%.*s, your join message is now: %.*s", player->name.size(), player->name.ptr(), parameters.size(), parameters.ptr())); source->sendMessage(player, Jupiter::StringS::Format("%.*s, your join message is now: %.*s", player->name.size(), player->name.ptr(), parameters.size(), parameters.ptr()));
} }

Write Preview
Loading…
Cancel
Save