Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Core/Spells Add support for quest Torch Tossing/More Torch Tossing #14776

Merged
merged 1 commit into from Jun 23, 2015

Conversation

sirikfoll
Copy link
Contributor

Updates #6879


class spell_midsummer_braziers_hit_AuraScript : public AuraScript
{
PrepareAuraScript(spell_midsummer_braziers_hit_AuraScript);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You forgot Validate() there. It has been standard for most scripts and we should keep it that way imo.

@EgoSumThan
Copy link
Contributor

Good job though 👍

@sirikfoll sirikfoll force-pushed the SpellMidsummer branch 3 times, most recently from 110b492 to 4401d0b Compare May 27, 2015 21:36
player->CastSpell(player, SPELL_TORCH_TOSSING_TRAINING_SUCCESS_ALLIANCE, true);
else if (player->GetTeam() == HORDE)
player->CastSpell(player, SPELL_TORCH_TOSSING_TRAINING_SUCCESS_HORDE, true);
player->RemoveAura(SPELL_BRAZIERS_HIT);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just do Remove()

@@ -0,0 +1,2 @@
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

INSERT INTO queries need a DELETE FROM query first to avoid errors. Insert the following line as a new line 1:

DELETE FROM `spell_script_names` WHERE `spell_id`= 45724 AND `ScriptName`= 'spell_midsummer_braziers_hit';

This will make it possible to run the SQL more than one time and avoid errors on subsequent executions.

@Carbenium
Copy link
Member

@joschiwald: is this ready?

MitchesD added a commit that referenced this pull request Jun 23, 2015
Core/Spells Add support for quest Torch Tossing/More Torch Tossing
@MitchesD MitchesD merged commit 8197467 into TrinityCore:3.3.5 Jun 23, 2015
@sirikfoll sirikfoll deleted the SpellMidsummer branch July 5, 2015 19:39
DDuarte added a commit that referenced this pull request Jul 12, 2015
Merge pull request #14776 from sirikfoll/SpellMidsummer

Core/Spells Add support for quest Torch Tossing/More Torch Tossing
(cherry picked from commit 8197467)

by sirikfoll

---

Rename 2015_08_29_00_world.sql to 2015_06_23_01_world.sql
(cherry picked from commit 352703e)

by MitchesD

---

Scripts/Spells: fix codestyle

thanks @whoami

(cherry picked from commit 0cba555)

by MitchesD
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants