josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Commands: Simplified .kick command handler and fixed possible crashes there

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Shauren
2010-11-24 15:31:20 +01:00
parent 03925d7324
commit 650f62796a
1 changed files with 17 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Chat/Commands/Level2.cpp
+5 -64
View File
@@ -206,27 +206,11 @@ bool ChatHandler::HandleDeMorphCommand(const char* /*args*/)
bool ChatHandler::HandleKickPlayerCommand(const char *args) bool ChatHandler::HandleKickPlayerCommand(const char *args)
{ {
const char* kickName = strtok((char*)args, " "); const char* kickName = strtok((char*)args, " ");
char* kickReason = strtok(NULL, "\n"); Player* target = NULL;
std::string reason = "No reason given"; std::string playerName;
std::string kicker = "CONSOLE"; if (!extractPlayerTarget((char*)args, &target, NULL, &playerName))
if (kickReason)
reason = kickReason;
if (m_session)
kicker = m_session->GetPlayer()->GetName();
if (!kickName)
{
Player* target;
if (!extractPlayerTarget((char*)args,&target))
return false; return false;
if (!target)
{
SendSysMessage(LANG_PLAYER_NOT_FOUND);
SetSentErrorMessage(true);
return false;
}
if (m_session && target == m_session->GetPlayer()) if (m_session && target == m_session->GetPlayer())
{ {
SendSysMessage(LANG_COMMAND_KICKSELF); SendSysMessage(LANG_COMMAND_KICKSELF);
@@ -239,54 +223,11 @@ bool ChatHandler::HandleKickPlayerCommand(const char *args)
return false; return false;
if (sWorld.getBoolConfig(CONFIG_SHOW_KICK_IN_WORLD)) if (sWorld.getBoolConfig(CONFIG_SHOW_KICK_IN_WORLD))
sWorld.SendWorldText(LANG_COMMAND_KICKMESSAGE, target->GetName(), kicker.c_str(), reason.c_str()); sWorld.SendWorldText(LANG_COMMAND_KICKMESSAGE, playerName.c_str());
else else
PSendSysMessage(LANG_COMMAND_KICKMESSAGE, target->GetName(), kicker.c_str(), reason.c_str()); PSendSysMessage(LANG_COMMAND_KICKMESSAGE, playerName.c_str());
target->GetSession()->KickPlayer(); target->GetSession()->KickPlayer();
}
else
{
std::string name = extractPlayerNameFromLink((char*)kickName);
if (name.empty())
{
SendSysMessage(LANG_PLAYER_NOT_FOUND);
SetSentErrorMessage(true);
return false;
}
if (m_session && name == m_session->GetPlayer()->GetName())
{
SendSysMessage(LANG_COMMAND_KICKSELF);
SetSentErrorMessage(true);
return false;
}
Player* player = sObjectMgr.GetPlayer(kickName);
if (!player)
{
SendSysMessage(LANG_PLAYER_NOT_FOUND);
SetSentErrorMessage(true);
return false;
}
if (HasLowerSecurity(player, 0))
{
SendSysMessage(LANG_YOURS_SECURITY_IS_LOW); //maybe replacement string for this later on
SetSentErrorMessage(true);
return false;
}
std::string nameLink = playerLink(name);
if (sWorld.getBoolConfig(CONFIG_SHOW_KICK_IN_WORLD))
sWorld.SendWorldText(LANG_COMMAND_KICKMESSAGE, nameLink.c_str(), kicker.c_str(), reason.c_str());
else
PSendSysMessage(LANG_COMMAND_KICKMESSAGE,nameLink.c_str());
player->GetSession()->KickPlayer();
}
return true; return true;
} }