From 7c9f6b4bc37eec7b94aaba1cd8912bd5c0054e2a Mon Sep 17 00:00:00 2001
From: win32 <none@none>
Date: Sun, 20 Dec 2009 13:35:08 +0200
Subject: Merge MaNGOS, Gossip System. Autor NoFantasy. * DB support required *
 Closes #859

--HG--
branch : trunk
---
 src/game/GameEventMgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/game/GameEventMgr.cpp')

diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp
index 6e66e87cbe1..eed46cfc1e3 100644
--- a/src/game/GameEventMgr.cpp
+++ b/src/game/GameEventMgr.cpp
@@ -1180,7 +1180,7 @@ void GameEventMgr::UpdateEventNPCFlags(uint16 event_id)
                     npcflag |= ci->npcflag;
                 cr->SetUInt32Value(UNIT_NPC_FLAGS,npcflag);
                 // reset gossip options, since the flag change might have added / removed some
-                cr->ResetGossipOptions();
+                //cr->ResetGossipOptions();
                 // update to world
                 cr->SendUpdateObjectToAllExcept(NULL);
             }
-- 
cgit v1.2.3