From c0bbb5248354dadad653f20a4d4bdbd70af0df4c Mon Sep 17 00:00:00 2001 From: Gultask <100873791+Gultask@users.noreply.github.com> Date: Sat, 24 Jun 2023 20:29:05 -0300 Subject: [PATCH] fix(Scripts/Midsummer): Stop Bonfires from spawning more gameobjects (#16618) * Update midsummer.cpp * . --- .../rev_1687646564965572500.sql | 2 + src/server/scripts/Events/midsummer.cpp | 38 ------------------- 2 files changed, 2 insertions(+), 38 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1687646564965572500.sql diff --git a/data/sql/updates/pending_db_world/rev_1687646564965572500.sql b/data/sql/updates/pending_db_world/rev_1687646564965572500.sql new file mode 100644 index 000000000..64ce59c69 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1687646564965572500.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_template` SET `ScriptName` = '' WHERE (`entry` = 16592); diff --git a/src/server/scripts/Events/midsummer.cpp b/src/server/scripts/Events/midsummer.cpp index 3fe6b35e1..a7b7d5ad7 100644 --- a/src/server/scripts/Events/midsummer.cpp +++ b/src/server/scripts/Events/midsummer.cpp @@ -46,43 +46,6 @@ public: } }; -struct npc_midsummer_bonfire : public ScriptedAI -{ - npc_midsummer_bonfire(Creature* creature) : ScriptedAI(creature) - { - me->IsAIEnabled = true; - goGUID.Clear(); - if (GameObject* go = me->SummonGameObject(GO_MIDSUMMER_BONFIRE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), 0.0f, 0.0f, 0.0f, 0.0f, 0)) - { - goGUID = go->GetGUID(); - me->RemoveGameObject(go, false); - } - } - - ObjectGuid goGUID; - - void SpellHit(Unit*, SpellInfo const* spellInfo) override - { - if (!goGUID) - return; - - // Extinguish fire - if (spellInfo->Id == SPELL_STAMP_OUT_BONFIRE) - { - if (GameObject* go = ObjectAccessor::GetGameObject(*me, goGUID)) - go->SetPhaseMask(2, true); - } - else if (spellInfo->Id == SPELL_LIGHT_BONFIRE) - { - if (GameObject* go = ObjectAccessor::GetGameObject(*me, goGUID)) - { - go->SetPhaseMask(1, true); - go->SendCustomAnim(1); - } - } - } -}; - struct npc_midsummer_torch_target : public ScriptedAI { npc_midsummer_torch_target(Creature* creature) : ScriptedAI(creature) @@ -542,7 +505,6 @@ void AddSC_event_midsummer_scripts() { // NPCs new go_midsummer_bonfire(); - RegisterCreatureAI(npc_midsummer_bonfire); RegisterCreatureAI(npc_midsummer_torch_target); // Spells