From 221137170ee6443b058182efdbc5a5949886bc8c Mon Sep 17 00:00:00 2001
From: Andrew <47818697+Nyeriah@users.noreply.github.com>
Date: Sat, 15 Nov 2025 18:25:46 -0300
Subject: [PATCH] fix(Scripts/HoS): Clean up faction update hacks (#23720)

---
 .../Ulduar/HallsOfStone/brann_bronzebeard.cpp        | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
index 81a5bb3e1..31b4a18b3 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp
@@ -355,7 +355,6 @@ public:
             SetDespawnAtEnd(false);
             ResetEvent();
 
-            me->SetFaction(FACTION_FRIENDLY);
             me->SetReactState(REACT_PASSIVE);
             me->ReplaceAllNpcFlags(UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER);
 
@@ -387,21 +386,12 @@ public:
                 case ACTION_START_ESCORT_EVENT:
                     Start(false, ObjectGuid::Empty, 0, true, false);
                     Talk(SAY_BRANN_ESCORT_START);
-                    me->SetFaction(FACTION_ESCORTEE_N_NEUTRAL_PASSIVE);
                     me->SetReactState(REACT_AGGRESSIVE);
                     me->SetRegeneratingHealth(true);
                     break;
                 case ACTION_START_TRIBUNAL:
                 {
                     me->SetReactState(REACT_PASSIVE);
-                    Map::PlayerList const& PlayerList = me->GetMap()->GetPlayers();
-                    if (!PlayerList.IsEmpty())
-                        for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
-                        {
-                            me->SetFaction(i->GetSource()->GetFaction());
-                            break;
-                        }
-
                     SetEscortPaused(false);
                     InitializeEvent();
                     me->ReplaceAllNpcFlags(UNIT_NPC_FLAG_NONE);
@@ -415,7 +405,6 @@ public:
                     break;
                 case ACTION_GO_TO_SJONNIR:
                     Talk(SAY_BRANN_ENTRANCE_MEET);
-                    me->SetFaction(FACTION_FRIENDLY);
                     me->SetReactState(REACT_PASSIVE);
                     me->SetRegeneratingHealth(true);
                     SetEscortPaused(false);
@@ -426,7 +415,6 @@ public:
                     me->SendMovementFlagUpdate();
                     break;
                 case ACTION_START_SJONNIR_FIGHT:
-                    me->SetFaction(FACTION_FRIENDLY);
                     SetEscortPaused(false);
                     break;
                 case ACTION_SJONNIR_DEAD: