Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-22 13:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Slash commands: Update compares (#1270)

Browse Source 
use case insensitive compare
use character name for kill instead of account name

Use correct Id for muting when a player is found
This commit is contained in:
David Markowitz 2023-11-15 17:29:00 -08:00 committed by GitHub
parent 8cd5bf7b8d
commit 59303a232e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dGame/Player.cpp
View File

@ -229,8 +229,8 @@ Player* Player::GetPlayer(const std::string& name) {
for (auto* character : characters) { for (auto* character : characters) {
if (!character->IsPlayer()) continue; if (!character->IsPlayer()) continue;
if (character->GetCharacter()->GetName() == name) { if (GeneralUtils::CaseInsensitiveStringCompare(name, character->GetCharacter()->GetName())) {
return static_cast<Player*>(character); return dynamic_cast<Player*>(character);
} }
} }

2
dGame/UserManager.cpp
View File

@ -125,7 +125,7 @@ User* UserManager::GetUser(const SystemAddress& sysAddr) {
User* UserManager::GetUser(const std::string& username) { User* UserManager::GetUser(const std::string& username) {
for (auto p : m_Users) { for (auto p : m_Users) {
if (p.second) { if (p.second) {
if (p.second->GetUsername() == username) return p.second; if (GeneralUtils::CaseInsensitiveStringCompare(p.second->GetUsername(), username)) return p.second;
} }
} }

7
dGame/dUtilities/SlashCommandHandler.cpp
View File

@ -448,9 +448,8 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
if (chatCommand == "kill" && args.size() == 1 && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER) { if (chatCommand == "kill" && args.size() == 1 && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER) {
ChatPackets::SendSystemMessage(sysAddr, u"Brutally murdering that player, if online on this server."); ChatPackets::SendSystemMessage(sysAddr, u"Brutally murdering that player, if online on this server.");
auto* user = UserManager::Instance()->GetUser(args[0]); auto* player = Player::GetPlayer(args[0]);
if (user) { if (player) {
auto* player = Game::entityManager->GetEntity(user->GetLoggedInChar());
player->Smash(entity->GetObjectID()); player->Smash(entity->GetObjectID());
ChatPackets::SendSystemMessage(sysAddr, u"It has been done, do you feel good about yourself now?"); ChatPackets::SendSystemMessage(sysAddr, u"It has been done, do you feel good about yourself now?");
return; return;
@ -1042,7 +1041,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
} }
} else { } else {
accountId = player->GetParentUser()->GetAccountID(); accountId = player->GetParentUser()->GetAccountID();
characterId = player->GetCharacter()->GetID(); characterId = player->GetObjectID();
} }
auto* userUpdate = Database::CreatePreppedStmt("UPDATE accounts SET mute_expire = ? WHERE id = ?;"); auto* userUpdate = Database::CreatePreppedStmt("UPDATE accounts SET mute_expire = ? WHERE id = ?;");