*Merge.

--HG--
branch : trunk

src/game/SpellMgr.h

@@ -385,12 +385,17 @@ inline bool IsAreaAuraEffect(uint32 effect)
 
 inline bool IsDispelSpell(SpellEntry const *spellInfo)
 {
+    //spellsteal is also dispel
     if (spellInfo->Effect[0] == SPELL_EFFECT_DISPEL ||
+        spellInfo->Effect[0] == SPELL_EFFECT_STEAL_BENEFICIAL_BUFF ||
         spellInfo->Effect[1] == SPELL_EFFECT_DISPEL ||
-        spellInfo->Effect[2] == SPELL_EFFECT_DISPEL )
+        spellInfo->Effect[1] == SPELL_EFFECT_STEAL_BENEFICIAL_BUFF ||
+        spellInfo->Effect[2] == SPELL_EFFECT_DISPEL ||
+        spellInfo->Effect[2] == SPELL_EFFECT_STEAL_BENEFICIAL_BUFF)
         return true;
     return false;
 }
+
 inline bool isSpellBreakStealth(SpellEntry const* spellInfo)
 {
     return !(spellInfo->AttributesEx & SPELL_ATTR_EX_NOT_BREAK_STEALTH);

src/game/TicketHandler.cpp

@@ -36,6 +36,8 @@ void WorldSession::HandleGMTicketCreateOpcode( WorldPacket & recv_data )
 	// always do a packet check
     CHECK_PACKET_SIZE(recv_data, 4*4+1+2*4);
 
+	uint32 map;
+    float x, y, z;
     std::string ticketText = "";
 	std::string ticketText2 = "";
 	GM_Ticket *ticket = new GM_Ticket;
@@ -43,7 +45,12 @@ void WorldSession::HandleGMTicketCreateOpcode( WorldPacket & recv_data )
 	WorldPacket data(SMSG_GMTICKET_CREATE, 4);
 
 	// recv Data
-	recv_data >> ticketText;
+	//TODO: Add map coordinates to tickets.
+    recv_data >> map;
+    recv_data >> x;
+    recv_data >> y;
+    recv_data >> z;
+    recv_data >> ticketText;
 
 	// get additional data, rarely used
 	recv_data >> ticketText2;

src/game/TicketMgr.cpp

@@ -108,11 +108,12 @@ void TicketMgr::DeleteGMTicketPermanently(uint64 ticketGuid)
 
 void TicketMgr::LoadGMTickets()
 {
+	InitTicketID();
 	// Delete all out of object holder
 	GM_TicketList.clear();
 	QueryResult *result = CharacterDatabase.Query( "SELECT `guid`, `playerGuid`, `name`, `message`, `timestamp`, `closed`, `assignedto`, `comment` FROM `gm_tickets` WHERE `closed` = '0'" );
 	GM_Ticket *ticket;
-	
+
 	if(!result)
 		return;
 
@@ -190,7 +191,7 @@ void TicketMgr::UpdateGMTicket(GM_Ticket *ticket)
 	SaveGMTicket(ticket);
 }
 
-uint64 TicketMgr::GenerateTicketID()
+void TicketMgr::InitTicketID()
 {
 	QueryResult *result = CharacterDatabase.Query("SELECT MAX(guid) FROM gm_tickets");
 	if(result)
@@ -198,6 +199,9 @@ uint64 TicketMgr::GenerateTicketID()
 		m_ticketid = result->Fetch()[0].GetUInt64() + 1;
 		delete result;
 	}
+}
 
+uint64 TicketMgr::GenerateTicketID()
+{
 	return ++m_ticketid;
-}␍
+}

src/game/TicketMgr.h

@@ -61,6 +61,7 @@ class TicketMgr
 		void SaveGMTicket(GM_Ticket* ticket);
 		
 		uint64 GenerateTicketID();
+		void InitTicketID();
 		GM_Ticket* GetGMTicket(uint64 ticketGuid);
 		GM_Ticket* GetGMTicketByPlayer(uint64 playerGuid);
 		GM_Ticket* GetGMTicketByName(const char *name);