aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game/SpellAuras.cpp6
-rw-r--r--src/game/Unit.cpp7
2 files changed, 12 insertions, 1 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index bd49f494b26..cbfebbb065c 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -398,6 +398,11 @@ m_auraSlot(MAX_AURAS), m_auraLevel(1), m_procCharges(0), m_stackAmount(1),m_aura
if(!m_permanent && modOwner)
{
+ // Glyph of Thorns
+ if (m_target == caster && m_spellProto->SpellFamilyName==SPELLFAMILY_DRUID && m_spellProto->SpellFamilyFlags[0] & 0x100)
+ if (AuraEffect * aurEff = m_target->GetDummyAura(57862))
+ m_maxduration += aurEff->GetAmount() * MINUTE * IN_MILISECONDS;
+
modOwner->ApplySpellMod(GetId(), SPELLMOD_DURATION, m_maxduration);
// Get zero duration aura after - need set m_maxduration > 0 for apply/remove aura work
if (m_maxduration<=0)
@@ -2754,7 +2759,6 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
return;
}
}
-
// Lifebloom
if ( GetSpellProto()->SpellFamilyFlags[1] & 0x10 )
{
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index ca478a42c9e..4c1022d4ae9 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -5814,6 +5814,13 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
{
switch(dummySpell->Id)
{
+ // Savage Roar (aura recast on return to cat form)
+ case 52610:
+ {
+ target = this;
+ triggered_spell_id = 62071;
+ break;
+ }
// Leader of the Pack
case 24932:
{