diff options
Diffstat (limited to 'src/game/Level2.cpp')
| -rw-r--r-- | src/game/Level2.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index ec86797eacd..722ed64fb97 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -1796,7 +1796,8 @@ bool ChatHandler::HandlePInfoCommand(const char* args) else { accId = objmgr.GetPlayerAccountIdByGUID(targetGUID); - Player plr(m_session); // use current session for temporary load + WorldSession session(0,NULL,SEC_PLAYER,0,0,LOCALE_enUS); + Player plr(&session); // use fake session for temporary load plr.MinimalLoadFromDB(NULL, targetGUID); money = plr.GetMoney(); total_player_time = plr.GetTotalPlayedTime(); @@ -4132,6 +4133,13 @@ bool ChatHandler::HandleCreatePetCommand(const char* args) { Player *player = m_session->GetPlayer(); Creature *creatureTarget = getSelectedCreature(); + + if(!creatureTarget || creatureTarget->isPet() || creatureTarget->GetTypeId() == TYPEID_PLAYER) + { + PSendSysMessage(LANG_SELECT_CREATURE); + SetSentErrorMessage(true); + return false; + } CreatureInfo const* cInfo = objmgr.GetCreatureTemplate(creatureTarget->GetEntry()); // Creatures with family 0 crashes the server @@ -4148,13 +4156,6 @@ bool ChatHandler::HandleCreatePetCommand(const char* args) SetSentErrorMessage(true); return false; } - - if(!creatureTarget || creatureTarget->isPet() || creatureTarget->GetTypeId() == TYPEID_PLAYER) - { - PSendSysMessage(LANG_SELECT_CREATURE); - SetSentErrorMessage(true); - return false; - } // Everything looks OK, create new pet Pet* pet = new Pet(HUNTER_PET); |