*Merge.

--HG--
branch : trunk

2 files changed, 2 insertions, 3 deletions

diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp
index 3951a2ba247..34943449b1e 100644
--- a/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp
+++ b/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp
@@ -125,8 +125,8 @@ struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance
                 if(data == DONE) HandleGameObject(MaulgarDoor, true);
                 Encounters[0] = data; break;
             case DATA_GRUULEVENT:
-                if(data == IN_PROGRESS) HandleGameObject(GruulDoor, true);
-                else HandleGameObject(GruulDoor, false);
+                if(data == IN_PROGRESS) HandleGameObject(GruulDoor, false);
+                else HandleGameObject(GruulDoor, true);
                 Encounters[1] = data; break;
         }
 
diff --git a/src/game/Chat.h b/src/game/Chat.h
index 7065c6dd0ed..6a10a60ad82 100644
--- a/src/game/Chat.h
+++ b/src/game/Chat.h
@@ -562,7 +562,6 @@ class ChatHandler
         GameObject* GetObjectGlobalyWithGuidOrNearWithDbGuid(uint32 lowguid,uint32 entry);
 
         // Utility methods for commands
-        void ShowTicket(uint64 guid, char const* text, char const* time);
         bool LookupPlayerSearchCommand(QueryResult* result, int32 limit);
         bool HandleBanListHelper(QueryResult* result);
         bool HandleBanHelper(BanMode mode,char const* args);