nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-26 07:06:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'azerothcore:master' into Playerbot

Browse Source
This commit is contained in:
ZhengPeiRu21
2022-05-12 09:41:56 -06:00
committed by GitHub
parent e05bc38461 0c0a2eac3b
commit 6b57ea8223
14 changed files with 324 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
View File

@@ -1157,29 +1157,6 @@ class spell_class_call_polymorph : public SpellScript
}
};
class aura_class_call_berserk : public AuraScript
{
PrepareAuraScript(aura_class_call_berserk);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARRIOR_BERSERK });
}
void HandleOnEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Unit* target = GetTarget())
{
target->CastSpell(target, SPELL_WARRIOR_BERSERK);
}
}
void Register() override
{
OnEffectRemove += AuraEffectRemoveFn(aura_class_call_berserk::HandleOnEffectRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_corrupted_totems : public SpellScript
{
PrepareSpellScript(spell_corrupted_totems);
@@ -1314,7 +1291,6 @@ void AddSC_boss_nefarian()
RegisterSpellScript(aura_class_call_wild_magic);
RegisterSpellScript(aura_class_call_siphon_blessing);
RegisterSpellScript(spell_class_call_polymorph);
RegisterSpellScript(aura_class_call_berserk);
RegisterSpellScript(spell_corrupted_totems);
RegisterSpellScript(spell_shadowblink);
RegisterSpellScript(spell_spawn_drakonid);

2
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
View File

@@ -373,8 +373,6 @@ public:
void UpdateAI(uint32 diff) override
{
return;
events2.Update(diff);
switch (events2.ExecuteEvent())
{