From e4ff74dcd5aae3972780ebb89831f6d09ed0e9ed Mon Sep 17 00:00:00 2001
From: Ovahlord <dreadkiller@gmx.de>
Date: Tue, 23 Feb 2021 22:35:20 +0100
Subject: [PATCH] Scripts/HoO: Brann will now shut up about the locked Vault of
 Lights door when a player tries to trigger his intro texts in front of the
 locked door while the event has already been started/completed

---
 .../Kalimdor/HallsOfOrigination/halls_of_origination.cpp      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp
index 4c33b93d79d..c5b48f76fa4 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp
@@ -273,6 +273,8 @@ struct npc_hoo_brann_bronzebeard : public CreatureAI
 
         me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER);
         me->setActive(true);
+        _allowAreaTriggerText = false;
+        _events.CancelEvent(EVENT_ENABLE_AREA_TRIGGER_TALK);
         _events.ScheduleEvent(EVENT_INTRO_1, 2s);
 
         return true;
@@ -283,7 +285,7 @@ struct npc_hoo_brann_bronzebeard : public CreatureAI
         switch (action)
         {
             case ACTION_INTRO_AREA_TRIGGER:
-                if (_allowAreaTriggerText)
+                if (_allowAreaTriggerText && _instance->GetData(DATA_VAULT_OF_LIGHTS) == NOT_STARTED)
                 {
                     _allowAreaTriggerText = false;
                     Talk(SAY_DOOR_INTRO);