Skip to content

Commit 72b0341

Browse files
committed
[s2824] Fix bug in Mograine and Whitemand (Scarlet Monastery)
Thanks to @X-Savior for reporting (based on commit SD2[3083] - a8dc923) Signed-off-by: Xfurry <xfurry@scriptdev2.com>
1 parent 04a8fa9 commit 72b0341

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ struct boss_scarlet_commander_mograineAI : public ScriptedAI
134134
m_creature->ClearAllReactives();
135135

136136
m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
137+
m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
137138
m_creature->SetStandState(UNIT_STAND_STATE_DEAD);
138139

139140
m_bHasDied = true;
@@ -165,6 +166,7 @@ struct boss_scarlet_commander_mograineAI : public ScriptedAI
165166
{
166167
// On ressurection, stop fake death and heal whitemane and resume fight
167168
m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
169+
m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
168170
m_creature->SetStandState(UNIT_STAND_STATE_STAND);
169171
// spell has script target on Whitemane
170172
DoCastSpellIfCan(m_creature, SPELL_LAYONHANDS);
@@ -265,6 +267,7 @@ struct boss_high_inquisitor_whitemaneAI : public ScriptedAI
265267
{
266268
// prevent killing blow before rezzing commander
267269
m_creature->SetHealth(uiDamage + 1);
270+
uiDamage = 0;
268271
}
269272
}
270273

sd2_revision_nr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#ifndef __SD2_REVISION_NR_H__
22
#define __SD2_REVISION_NR_H__
3-
#define SD2_REVISION_NR "s2823"
3+
#define SD2_REVISION_NR "s2824"
44
#endif // __SD2_REVISION_NR_H__

0 commit comments

Comments
 (0)