Browse Source

RenX.Core:

* Removed unnecessary banCheck() calls in Server
* Removed old debug line
FunCommands:
* Added a few extra 8ball possibilities. :p
pull/3/head
Jessica James 9 years ago
parent
commit
f49b4fcb68
  1. 45
      FunCommands/FunCommands.cpp
  2. BIN
      Release/Bot.lib
  3. BIN
      Release/Plugins/RenX.Core.lib
  4. 10
      RenX.Core/RenX_Server.cpp

45
FunCommands/FunCommands.cpp

@ -37,8 +37,7 @@ void EightBallIRCCommand::create()
void EightBallIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters) void EightBallIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &channel, const Jupiter::ReadableString &nick, const Jupiter::ReadableString &parameters)
{ {
Jupiter::StringS msg; Jupiter::StringS msg;
unsigned short r = rand() % 20; switch (rand() % 31)
switch (r)
{ {
case 0: case 0:
msg.set("No."_jrs); msg.set("No."_jrs);
@ -68,7 +67,7 @@ void EightBallIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString
msg.set("Fuck me."_jrs); msg.set("Fuck me."_jrs);
break; break;
case 9: case 9:
msg.set("Good thing I bend that way. ;)"_jrs); msg.set("Good thing I bend that way!"_jrs);
break; break;
case 10: case 10:
msg.format("Hai %.*s ;)", nick.size(), nick.ptr()); msg.format("Hai %.*s ;)", nick.size(), nick.ptr());
@ -77,9 +76,12 @@ void EightBallIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString
msg.format("Let's ban %.*s!", nick.size(), nick.ptr()); msg.format("Let's ban %.*s!", nick.size(), nick.ptr());
break; break;
case 12: case 12:
msg.format("Sorry %.*s, but your IQ must be at least %d for me to care.", nick.size(), nick.ptr(), rand() % 50); msg.set("Fuck your lineage."_jrs);
break; break;
case 13: case 13:
if (channel.equals("#Jail"_jrs))
msg.set("Ask me those kind of questions in #Politics"_jrs);
else
msg.set("Ask me those kind of questions in #Jail"_jrs); msg.set("Ask me those kind of questions in #Jail"_jrs);
break; break;
case 14: case 14:
@ -98,7 +100,40 @@ void EightBallIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString
msg.set("I hurr u liek mudkipz?"_jrs); msg.set("I hurr u liek mudkipz?"_jrs);
break; break;
case 19: case 19:
msg.set("Walk this way, babycakes ;)"_jrs); msg.set("Fortune might be in your favor."_jrs);
break;
case 20:
msg.set("Fortune might not be in your favor."_jrs);
break;
case 21:
msg.set("Based on the tragectory of James Bond (9007) in relationship to the 9th circle of hell located on the 3rd planet of Sol, you're going to hell."_jrs);
break;
case 22:
msg.set("Based on the tragectory of James Bond (9007) in relationship to the 9th circle of hell located on the 3rd planet of Sol, yes!"_jrs);
break;
case 23:
msg.set("Based on the tragectory of James Bond (9007) in relationship to the 9th circle of hell located on the 3rd planet of Sol, it's approximately as likely as getting a \"yes\" from me."_jrs);
break;
case 24:
msg.set("Fucking campers."_jrs);
break;
case 25:
msg.set("The 8ball seems to be stuck. Try again later. (Dang, you can't even get an 8ball to work for you? That's pretty sad yo)"_jrs);
break;
case 26:
msg.set("The 8ball says... Go away? Wow, it really must not like you. Go away."_jrs);
break;
case 27:
msg.set("Swag"_jrs);
break;
case 28:
msg.set("Based on the orbit and trajectory of the 33rd moon of the planet assinine 6, no."_jrs);
break;
case 29:
msg.set("Based on the orbin and trajectory of the moon assinsix 9, yes!"_jrs);
break;
case 30:
msg.set("Come visit me on the 5th planet away from Sol, and I'll give you whatever you want."_jrs);
break; break;
default: default:
msg.set("Nothingness. You suck. Go rot."_jrs); msg.set("Nothingness. You suck. Go rot."_jrs);

BIN
Release/Bot.lib

Binary file not shown.

BIN
Release/Plugins/RenX.Core.lib

Binary file not shown.

10
RenX.Core/RenX_Server.cpp

@ -392,6 +392,7 @@ void RenX::Server::banCheck()
{ {
if (RenX::Server::players.size() != 0) if (RenX::Server::players.size() != 0)
for (Jupiter::DLList<RenX::PlayerInfo>::Node *node = RenX::Server::players.getNode(0); node != nullptr; node = node->next) for (Jupiter::DLList<RenX::PlayerInfo>::Node *node = RenX::Server::players.getNode(0); node != nullptr; node = node->next)
if (node->data->isBot == false)
this->banCheck(node->data); this->banCheck(node->data);
} }
@ -436,7 +437,6 @@ void RenX::Server::banCheck(RenX::PlayerInfo *player)
else else
netmask = Jupiter_prefix_length_to_netmask(entry->prefix_length); netmask = Jupiter_prefix_length_to_netmask(entry->prefix_length);
printf("%d vs %d" ENDL, (entry->ip & netmask), (player->ip32 & netmask));
if ((this->localSteamBan && entry->steamid != 0 && entry->steamid == player->steamid) if ((this->localSteamBan && entry->steamid != 0 && entry->steamid == player->steamid)
|| (this->localIPBan && entry->ip != 0 && (entry->ip & netmask) == (player->ip32 & netmask)) || (this->localIPBan && entry->ip != 0 && (entry->ip & netmask) == (player->ip32 & netmask))
|| (this->localRDNSBan && entry->rdns.isNotEmpty() && entry->is_rdns_ban() && player->rdns.match(entry->rdns)) || (this->localRDNSBan && entry->rdns.isNotEmpty() && entry->is_rdns_ban() && player->rdns.match(entry->rdns))
@ -1233,8 +1233,12 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line)
this->players.add(r); this->players.add(r);
r->uuid = calc_uuid(r); r->uuid = calc_uuid(r);
if (r->isBot == false)
{
RenX::exemptionDatabase->exemption_check(r); RenX::exemptionDatabase->exemption_check(r);
this->banCheck(r); this->banCheck(r);
}
for (size_t i = 0; i < xPlugins.size(); i++) for (size_t i = 0; i < xPlugins.size(); i++)
xPlugins.get(i)->RenX_OnPlayerCreate(this, r); xPlugins.get(i)->RenX_OnPlayerCreate(this, r);
@ -1263,10 +1267,13 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line)
if (recalcUUID) if (recalcUUID)
{ {
this->setUUIDIfDifferent(r, calc_uuid(r)); this->setUUIDIfDifferent(r, calc_uuid(r));
if (r->isBot == false)
{
RenX::exemptionDatabase->exemption_check(r); RenX::exemptionDatabase->exemption_check(r);
this->banCheck(r); this->banCheck(r);
} }
} }
}
return r; return r;
}; };
auto parseGetPlayerOrAdd = [&parsePlayerData, &getPlayerOrAdd](const Jupiter::ReadableString &token) auto parseGetPlayerOrAdd = [&parsePlayerData, &getPlayerOrAdd](const Jupiter::ReadableString &token)
@ -2298,6 +2305,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line)
if (player != nullptr) if (player != nullptr)
{ {
player->id = tokens.getToken(3).asInt(); player->id = tokens.getToken(3).asInt();
if (player->isBot == false)
this->banCheck(player); this->banCheck(player);
for (size_t i = 0; i < xPlugins.size(); i++) for (size_t i = 0; i < xPlugins.size(); i++)
xPlugins.get(i)->RenX_OnIDChange(this, player, oldID); xPlugins.get(i)->RenX_OnIDChange(this, player, oldID);

Loading…
Cancel
Save