From 8dc10022a6e34e510a5e92ecbeaf3fc3459de3d2 Mon Sep 17 00:00:00 2001 From: David Carlos Manuelda Date: Tue, 11 Aug 2015 05:25:53 +0200 Subject: Fixed boss evade and doors closed by cr4st. Should close #6377 and #15239 (cherry picked from commit e430f3f61ae45ca0e8e251f96a1605bdb9299eb1) --- src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp index 8d7d43048b4..237a82cb476 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp @@ -106,7 +106,8 @@ public: void AttackStart(Unit* who) override { //can't use entercombat(), boss' dmg aura sets near players in combat, before entering the room's door - instance->SetData(TYPE_BARON, IN_PROGRESS); + if (instance && instance->GetData(TYPE_BARON) == NOT_STARTED) + instance->SetData(TYPE_BARON, IN_PROGRESS); ScriptedAI::AttackStart(who); } -- cgit v1.2.3