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.

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 73347ff1163..52491bdf2f5 100644
--- a/src/server/scripts/Spells/spell_holiday.cpp
+++ b/src/server/scripts/Spells/spell_holiday.cpp
@@ -1187,6 +1187,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,
 };
@@ -1214,10 +1215,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;
                 }