*Merge.

--HG-- branch : trunk
2009-04-29 16:51:27 -05:00
parent b89d307f75 e695016e94
commit e490779de0
16 changed files with 2969 additions and 880 deletions
@@ -60,12 +60,10 @@ GM_Ticket* TicketMgr::GetGMTicketByName(const char* name)
    if(!normalizePlayerName(pname))
        return NULL;

-    Player *plr = objmgr.GetPlayer(pname.c_str());
-    if(!plr)
+    uint64 playerGuid = objmgr.GetPlayerGUIDByName(pname.c_str());
+    if(!playerGuid)
        return NULL;

-    uint64 playerGuid = plr->GetGUID();
-
    for(GmTicketList::iterator i = GM_TicketList.begin(); i != GM_TicketList.end();)
    {
        if((*i)->playerGuid == playerGuid && (*i)->closed == 0)