* Omit closed tickets when checking for an active GM ticket.
--HG-- branch : trunk
This commit is contained in:
@@ -8467,7 +8467,7 @@ void ObjectMgr::_AddOrUpdateGMTicket(GM_Ticket &ticket)
|
|||||||
void ObjectMgr::RemoveGMTicket(GM_Ticket *ticket, int64 source, bool permanently)
|
void ObjectMgr::RemoveGMTicket(GM_Ticket *ticket, int64 source, bool permanently)
|
||||||
{
|
{
|
||||||
for(GmTicketList::iterator i = m_GMTicketList.begin(); i != m_GMTicketList.end(); ++i)
|
for(GmTicketList::iterator i = m_GMTicketList.begin(); i != m_GMTicketList.end(); ++i)
|
||||||
if((*i) == ticket)
|
if((*i)->guid == ticket->guid)
|
||||||
{
|
{
|
||||||
if(permanently)
|
if(permanently)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -845,7 +845,7 @@ class ObjectMgr
|
|||||||
GM_Ticket *GetGMTicket(uint64 ticketGuid)
|
GM_Ticket *GetGMTicket(uint64 ticketGuid)
|
||||||
{
|
{
|
||||||
for(GmTicketList::const_iterator i = m_GMTicketList.begin(); i != m_GMTicketList.end(); ++i)
|
for(GmTicketList::const_iterator i = m_GMTicketList.begin(); i != m_GMTicketList.end(); ++i)
|
||||||
if((*i) && (*i)->guid == ticketGuid)
|
if((*i) && (*i)->guid == ticketGuid && (*i)->closed == 0)
|
||||||
return (*i);
|
return (*i);
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
@@ -853,7 +853,7 @@ class ObjectMgr
|
|||||||
GM_Ticket *GetGMTicketByPlayer(uint64 playerGuid)
|
GM_Ticket *GetGMTicketByPlayer(uint64 playerGuid)
|
||||||
{
|
{
|
||||||
for(GmTicketList::const_iterator i = m_GMTicketList.begin(); i != m_GMTicketList.end(); ++i)
|
for(GmTicketList::const_iterator i = m_GMTicketList.begin(); i != m_GMTicketList.end(); ++i)
|
||||||
if((*i) && (*i)->playerGuid == playerGuid)
|
if((*i) && (*i)->playerGuid == playerGuid && (*i)->closed == 0)
|
||||||
return (*i);
|
return (*i);
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|||||||
Reference in New Issue
Block a user