diff options
| -rw-r--r-- | sql/updates/world/3.3.5/2022_02_27_02_world.sql | 2 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_generic.cpp | 45 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_item.cpp | 33 |
3 files changed, 2 insertions, 78 deletions
diff --git a/sql/updates/world/3.3.5/2022_02_27_02_world.sql b/sql/updates/world/3.3.5/2022_02_27_02_world.sql new file mode 100644 index 00000000000..d4741b7f839 --- /dev/null +++ b/sql/updates/world/3.3.5/2022_02_27_02_world.sql @@ -0,0 +1,2 @@ +-- +DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_gen_summon_fire_elemental','spell_gen_summon_earth_elemental','spell_item_crystal_prison_dummy_dnd'); diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 427aacdf6f6..72b61c099ea 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -3249,49 +3249,6 @@ class spell_gen_spirit_healer_res : public SpellScript } }; -enum SummonElemental -{ - SPELL_SUMMON_FIRE_ELEMENTAL = 8985, - SPELL_SUMMON_EARTH_ELEMENTAL = 19704 -}; - -class spell_gen_summon_elemental : public AuraScript -{ - PrepareAuraScript(spell_gen_summon_elemental); - -public: - spell_gen_summon_elemental(uint32 spellId) : AuraScript(), _spellId(spellId) { } - -private: - bool Validate(SpellInfo const* /*spellInfo*/) override - { - return ValidateSpellInfo({ _spellId }); - } - - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) - { - if (GetCaster()) - if (Unit* owner = GetCaster()->GetOwner()) - owner->CastSpell(owner, _spellId, true); - } - - void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) - { - if (GetCaster()) - if (Unit* owner = GetCaster()->GetOwner()) - if (owner->GetTypeId() == TYPEID_PLAYER) /// @todo this check is maybe wrong - owner->ToPlayer()->RemovePet(nullptr, PET_SAVE_NOT_IN_SLOT, true); - } - - void Register() override - { - AfterEffectApply += AuraEffectApplyFn(spell_gen_summon_elemental::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_gen_summon_elemental::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - } - - uint32 _spellId; -}; - enum TournamentMountsSpells { SPELL_LANCE_EQUIPPED = 62853 @@ -4653,8 +4610,6 @@ void AddSC_generic_spell_scripts() RegisterSpellScript(spell_gen_seaforium_blast); RegisterSpellScript(spell_gen_spectator_cheer_trigger); RegisterSpellScript(spell_gen_spirit_healer_res); - RegisterSpellScriptWithArgs(spell_gen_summon_elemental, "spell_gen_summon_fire_elemental", SPELL_SUMMON_FIRE_ELEMENTAL); - RegisterSpellScriptWithArgs(spell_gen_summon_elemental, "spell_gen_summon_earth_elemental", SPELL_SUMMON_EARTH_ELEMENTAL); RegisterSpellScript(spell_gen_summon_tournament_mount); RegisterSpellScript(spell_gen_throw_shield); RegisterSpellScript(spell_gen_tournament_duel); diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 1fd8036c825..a20432a54cb 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -2723,38 +2723,6 @@ class spell_item_purify_helboar_meat : public SpellScript } }; -enum CrystalPrison -{ - OBJECT_IMPRISONED_DOOMGUARD = 179644, -}; - -class spell_item_crystal_prison_dummy_dnd : public SpellScript -{ - PrepareSpellScript(spell_item_crystal_prison_dummy_dnd); - - bool Validate(SpellInfo const* /*spell*/) override - { - if (!sObjectMgr->GetGameObjectTemplate(OBJECT_IMPRISONED_DOOMGUARD)) - return false; - return true; - } - - void HandleDummy(SpellEffIndex /* effIndex */) - { - if (Creature* target = GetHitCreature()) - if (target->isDead() && !target->IsPet()) - { - GetCaster()->SummonGameObject(OBJECT_IMPRISONED_DOOMGUARD, *target, QuaternionData(), Seconds(target->GetRespawnTime() - GameTime::GetGameTime())); - target->DespawnOrUnsummon(); - } - } - - void Register() override - { - OnEffectHitTarget += SpellEffectFn(spell_item_crystal_prison_dummy_dnd::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); - } -}; - enum NighInvulnerability { SPELL_NIGH_INVULNERABILITY = 30456, @@ -4282,7 +4250,6 @@ void AddSC_item_spell_scripts() RegisterSpellScript(spell_item_ashbringer); RegisterSpellScript(spell_magic_eater_food); RegisterSpellScript(spell_item_purify_helboar_meat); - RegisterSpellScript(spell_item_crystal_prison_dummy_dnd); RegisterSpellScript(spell_item_nigh_invulnerability); RegisterSpellScript(spell_item_poultryizer); RegisterSpellScript(spell_item_socrethars_stone); |