aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Carlos Manuelda <StormByte@gmail.com>2015-08-11 05:25:53 +0200
committerShauren <shauren.trinity@gmail.com>2015-10-31 18:21:23 +0100
commit8dc10022a6e34e510a5e92ecbeaf3fc3459de3d2 (patch)
tree40eb7369c6a20b726f8ffa41f3cb9ad377ddbb3c
parentf56bb2e0a6973b7c9ea2800af04ada9f889c97c7 (diff)
Fixed boss evade and doors closed by cr4st.
Should close #6377 and #15239 (cherry picked from commit e430f3f61ae45ca0e8e251f96a1605bdb9299eb1)
-rw-r--r--src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp3
1 files changed, 2 insertions, 1 deletions
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);
}