diff --git a/Jupiter b/Jupiter index b5d253d..911d3fc 160000 --- a/Jupiter +++ b/Jupiter @@ -1 +1 @@ -Subproject commit b5d253da72553929b18a805c01fc2999568d99e3 +Subproject commit 911d3fc122e33f58e96ba2325eabd41e633105f0 diff --git a/Release/Bot.lib b/Release/Bot.lib index 2e4891d..8995d41 100644 Binary files a/Release/Bot.lib and b/Release/Bot.lib differ diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index d2a6013..d9ef841 100644 Binary files a/Release/Plugins/RenX.Core.lib and b/Release/Plugins/RenX.Core.lib differ diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp index 79ed003..b3ea9a9 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -1135,13 +1135,13 @@ void RenX::Server::init() RenX::Server::addCommand(cmd); if (commandAccessLevels != nullptr) { - const Jupiter::ReadableString &accessLevel = RenX::Server::commandAccessLevels->getValue(cmd->getTrigger()); + const Jupiter::ReadableString &accessLevel = RenX::Server::commandAccessLevels->get(cmd->getTrigger()); if (accessLevel.isEmpty() == false) cmd->setAccessLevel(accessLevel.asInt()); } if (commandAliases != nullptr) { - const Jupiter::ReadableString &aliasList = RenX::Server::commandAliases->getValue(cmd->getTrigger()); + const Jupiter::ReadableString &aliasList = RenX::Server::commandAliases->get(cmd->getTrigger()); j = aliasList.wordCount(WHITESPACE); while (j != 0) cmd->addTrigger(Jupiter::ReferenceString::getWord(aliasList, --j, WHITESPACE)); diff --git a/RenX.Medals/RenX_Medals.cpp b/RenX.Medals/RenX_Medals.cpp index 9f68057..6eedd45 100644 --- a/RenX.Medals/RenX_Medals.cpp +++ b/RenX.Medals/RenX_Medals.cpp @@ -109,8 +109,8 @@ void RenX_MedalsPlugin::RenX_OnJoin(RenX::Server *server, const RenX::PlayerInfo Jupiter::INIFile::Section *section = RenX_MedalsPlugin::joinMessageFile.getSection(RenX_MedalsPlugin::firstSection); if (section != nullptr) { - while (section->hasKey(STRING_LITERAL_AS_REFERENCE("MaxRecs")) && section->getValue(STRING_LITERAL_AS_REFERENCE("MaxRecs")).asInt() < worth) - if ((section = RenX_MedalsPlugin::joinMessageFile.getSection(section->getValue(STRING_LITERAL_AS_REFERENCE("NextSection")))) == nullptr) + while (section->hasKey(STRING_LITERAL_AS_REFERENCE("MaxRecs")) && section->get(STRING_LITERAL_AS_REFERENCE("MaxRecs")).asInt() < worth) + if ((section = RenX_MedalsPlugin::joinMessageFile.getSection(section->get(STRING_LITERAL_AS_REFERENCE("NextSection")))) == nullptr) return; // No matching section found. if (section->hasKey(STRING_LITERAL_AS_REFERENCE("1"))) @@ -289,8 +289,8 @@ void RecsGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, co source->sendMessage(player, STRING_LITERAL_AS_REFERENCE("Error: Player not found! Syntax: recs [player]")); else { - unsigned int recs = section->getValue(STRING_LITERAL_AS_REFERENCE("Recs")).asUnsignedInt(); - unsigned int noobs = section->getValue(STRING_LITERAL_AS_REFERENCE("Noobs")).asUnsignedInt(); + unsigned int recs = section->get(STRING_LITERAL_AS_REFERENCE("Recs")).asUnsignedInt(); + unsigned int noobs = section->get(STRING_LITERAL_AS_REFERENCE("Noobs")).asUnsignedInt(); source->sendMessage(player, Jupiter::StringS::Format("[Archive] %.*s has %u and %u n00bs. Their worth: %d", section->getName().size(), section->getName().ptr(), recs, noobs, recs - noobs)); } }