aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/4725_world_scripts.sql5
-rw-r--r--src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp8
2 files changed, 9 insertions, 4 deletions
diff --git a/sql/updates/4725_world_scripts.sql b/sql/updates/4725_world_scripts.sql
new file mode 100644
index 00000000000..83a38a2210c
--- /dev/null
+++ b/sql/updates/4725_world_scripts.sql
@@ -0,0 +1,5 @@
+UPDATE `creature_template` SET `minlevel`='80' WHERE (`entry`='22207');
+UPDATE `creature_template` SET `maxlevel`='80' WHERE (`entry`='22207');
+UPDATE `creature_template` SET `faction_A`='14' WHERE (`entry`='22207');
+UPDATE `creature_template` SET `faction_H`='14' WHERE (`entry`='22207');
+UPDATE `creature_template` SET `flags_extra`='128' WHERE (`entry`='22207'); \ No newline at end of file
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
index 28e8a4d5e6e..d3e890e9a40 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
+++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
@@ -287,11 +287,11 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
//if(who->HasStealthAura())
// who->RemoveSpellsCausingAura(SPELL_AURA_MOD_STEALTH);
- if(Phase != 2)
- AttackStart(who);
-
- if(!m_creature->isInCombat())
+ if(!m_creature->isInCombat())//AttackStart() sets UNIT_FLAG_IN_COMBAT, so this msut be before attacking
StartEvent();
+
+ if(Phase != 2)
+ AttackStart(who);
}
}
}