Merge commit 'origin/master' into 310

This commit is contained in:
VladimirMangos 2009-03-27 03:22:41 +03:00
commit bb9e2ab658
46 changed files with 410 additions and 386 deletions

View file

@ -2066,7 +2066,7 @@ bool ChatHandler::HandleModifyMorphCommand(const char* args)
//kick player
bool ChatHandler::HandleKickPlayerCommand(const char *args)
{
if (!args)
if (!*args)
{
Player* player = getSelectedPlayer();