diff options
| author | SnapperRy <snapperryen@gmail.com> | 2016-07-05 15:19:30 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-02-04 23:37:59 +0100 |
| commit | 623215ce31702c45d4d590e4523ac6debd5d6a0c (patch) | |
| tree | 3d5ee390d441959dfcfa2e5d6751da48c829b078 /src/server/scripts/Spells | |
| parent | e55420af8653cd52697a94c85badc91c9a1774a7 (diff) | |
Event/Midsummer: improve pole ribbon functionality (#17464)
Event/Midsummer: improve pole ribbon functionality:
- Bunny creature should hover, which puts it in the intended position.
- Use correct visual and internal spells to handle cosmetics and timers.
(cherry picked from commit 03b15d968b56b7855693e47e79a320cf9990d73c)
Rename 9999_99_99_99_world.sql to 2016_07_05_03_world.sql
(cherry picked from commit 8edc1caf32635f417aee290811a9ef2860f145b6)
Diffstat (limited to 'src/server/scripts/Spells')
| -rw-r--r-- | src/server/scripts/Spells/spell_holiday.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp index 66bcbd4a563..71c8878b81b 100644 --- a/src/server/scripts/Spells/spell_holiday.cpp +++ b/src/server/scripts/Spells/spell_holiday.cpp @@ -1287,6 +1287,7 @@ enum RibbonPoleData { SPELL_HAS_FULL_MIDSUMMER_SET = 58933, SPELL_BURNING_HOT_POLE_DANCE = 58934, + SPELL_RIBBON_DANCE_COSMETIC = 29726, SPELL_RIBBON_DANCE = 29175, GO_RIBBON_POLE = 181605, }; @@ -1314,10 +1315,11 @@ class spell_gen_ribbon_pole_dancer_check : public SpellScriptLoader Unit* target = GetTarget(); // check if aura needs to be removed - if (!target->FindNearestGameObject(GO_RIBBON_POLE, 20.0f) || !target->HasUnitState(UNIT_STATE_CASTING)) + if (!target->FindNearestGameObject(GO_RIBBON_POLE, 8.0f) || !target->HasUnitState(UNIT_STATE_CASTING)) { target->InterruptNonMeleeSpells(false); target->RemoveAurasDueToSpell(GetId()); + target->RemoveAura(SPELL_RIBBON_DANCE_COSMETIC); return; } |