From 23af82081bcac48c04f336aefe720cfd577abc26 Mon Sep 17 00:00:00 2001 From: NoFantasy Date: Sat, 26 Mar 2011 10:53:20 +0100 Subject: [PATCH] [11290] Add dummy aura effect of spell 62109 Also add a smaller hack to have access to m_caster later (see code comments) Signed-off-by: NoFantasy --- src/game/SpellAuras.cpp | 4 ++++ src/game/SpellEffects.cpp | 7 ++++++- src/shared/revision_nr.h | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 65c1992ec..4ccc99456 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -2043,6 +2043,10 @@ void Aura::HandleAuraDummy(bool apply, bool Real) // Reindeer Transformation target->CastSpell(target, 25860, true, NULL, this); return; + case 62109: // Tails Up: Aura + target->setFaction(1990); // Ambient (hostile) + target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + return; case 63624: // Learn a Second Talent Specialization // Teach Learn Talent Specialization Switches, required for client triggered casts, allow after 30 sec delay if (target->GetTypeId() == TYPEID_PLAYER) diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 689791d51..b4cd92413 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -2149,7 +2149,12 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx) // Sleeping Sleep unitTarget->CastSpell(unitTarget, 62248, true); - unitTarget->setFaction(190); // Ambient (neutral) + // Although not really correct, it's needed to have access to m_caster later, + // to properly process spell 62110 (cast from gossip). + // Can possibly be replaced with a similar function that doesn't set any dynamic flags. + ((Creature*)unitTarget)->SetLootRecipient(m_caster); + + unitTarget->setFaction(190); // Ambient (neutral) unitTarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); return; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index cf79b9839..d9abc6f56 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11289" + #define REVISION_NR "11290" #endif // __REVISION_NR_H__