OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-21 21:20:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

PR feedback

Browse Source
This commit is contained in:
gsemaj 2024-06-23 17:04:21 -07:00
parent 41626b1e8a
commit 11eaf3b876
No known key found for this signature in database
GPG Key ID: 24B96BAA40497929
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/CustomCommands.cpp
View File

@ -91,9 +91,12 @@ static void accessCommand(std::string full, std::vector<std::string>& args, CNSo
char *tmp; char *tmp;
Player* self = PlayerManager::getPlayer(sock);
int selfAccess = self->accountLevel;
Player* player; Player* player;
if (args[1].compare(".") == 0) { if (args[1].compare(".") == 0) {
player = PlayerManager::getPlayer(sock); player = self;
} else { } else {
int id = std::strtol(args[1].c_str(), &tmp, 10); int id = std::strtol(args[1].c_str(), &tmp, 10);
if (*tmp) { if (*tmp) {
@ -106,6 +109,12 @@ static void accessCommand(std::string full, std::vector<std::string>& args, CNSo
Chat::sendServerMessage(sock, "Could not find player with ID " + std::to_string(id)); Chat::sendServerMessage(sock, "Could not find player with ID " + std::to_string(id));
return; return;
} }
// Messing with other players requires a baseline access of 30
if (player != self && selfAccess > 30) {
Chat::sendServerMessage(sock, "Can't check or change other players access levels (insufficient privileges)");
return;
}
} }
std::string playerName = PlayerManager::getPlayerName(player); std::string playerName = PlayerManager::getPlayerName(player);
@ -118,8 +127,6 @@ static void accessCommand(std::string full, std::vector<std::string>& args, CNSo
// Can't change the access level of someone with stronger privileges // Can't change the access level of someone with stronger privileges
// N.B. lower value = stronger privileges // N.B. lower value = stronger privileges
Player* self = PlayerManager::getPlayer(sock);
int selfAccess = self->accountLevel;
if (currentAccess <= selfAccess) { if (currentAccess <= selfAccess) {
Chat::sendServerMessage(sock, "Can't change this player's access level (insufficient privileges)"); Chat::sendServerMessage(sock, "Can't change this player's access level (insufficient privileges)");
return; return;
@ -133,7 +140,7 @@ static void accessCommand(std::string full, std::vector<std::string>& args, CNSo
// Can only assign an access level weaker than yours // Can only assign an access level weaker than yours
if (newAccess <= selfAccess) { if (newAccess <= selfAccess) {
Chat::sendServerMessage(sock, "Can't assign stronger privileges than your own"); Chat::sendServerMessage(sock, "Can only assign privileges weaker than your own");
return; return;
} }