From 5cc4b07a5756e1f55d44927c466299cf4ef20d1b Mon Sep 17 00:00:00 2001
From: Machiavelli <none@none>
Date: Fri, 19 Jun 2009 20:07:29 +0200
Subject: [PATCH] * Omit closed tickets when checking for an active GM ticket.

--HG--
branch : trunk
---
 src/game/ObjectMgr.cpp | 2 +-
 src/game/ObjectMgr.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 009962e320..cbcb7b95e1 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -8467,7 +8467,7 @@ void ObjectMgr::_AddOrUpdateGMTicket(GM_Ticket &ticket)
 void ObjectMgr::RemoveGMTicket(GM_Ticket *ticket, int64 source, bool permanently)
 {
     for(GmTicketList::iterator i = m_GMTicketList.begin(); i != m_GMTicketList.end(); ++i)
-        if((*i) == ticket)
+        if((*i)->guid == ticket->guid)
         {
             if(permanently)
             {
diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h
index 8bbfeaa596..f518911646 100644
--- a/src/game/ObjectMgr.h
+++ b/src/game/ObjectMgr.h
@@ -845,7 +845,7 @@ class ObjectMgr
         GM_Ticket *GetGMTicket(uint64 ticketGuid)
         {
             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 NULL;
@@ -853,7 +853,7 @@ class ObjectMgr
         GM_Ticket *GetGMTicketByPlayer(uint64 playerGuid)
         {
             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 NULL;