[9523] Stacking Auras from different castItems.

Auntie Mangos · January 1, 1970

What bug does the patch fix? What features does the patch add?

Allows Auras procced by items to stack, if the castItems are different.

Popular example: Dualwielding weapons with Crusader- or Mongoose-Enchant or unsing these Maces from Blacksmithing

For which repository revision was the patch created?

mangos-0.12 @ 061b4a3147da182e7fda3845ac4c543eeaddc3bb

Is there a thread in the bug report section or at lighthouse?

Thread

Who has been writing this patch?

Sarjuuk

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 6d02ea4..e078127 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -849,8 +849,9 @@ void Aura::_AddAura()
        Unit::spellEffectPair spair = Unit::spellEffectPair(GetId(), i);
        for(Unit::AuraMap::const_iterator itr = m_target->GetAuras().lower_bound(spair); itr != m_target->GetAuras().upper_bound(spair); ++itr)
        {
-            // allow use single slot only by auras from same caster
-            if(itr->second->GetCasterGUID()==GetCasterGUID())
+            // allow use single slot only by auras from same caster (and item)
+            if ((itr->second->GetCasterGUID() == GetCasterGUID()) &&
+                (itr->second->GetCastItemGUID() == GetCastItemGUID()))
            {
                samespell = true;
                if (m_effIndex > itr->second->GetEffIndex())
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 076f6e7..46b36ce 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -3662,6 +3662,10 @@ bool Unit::AddAura(Aura *Aur)
                    Aura* aur2 = i2->second;
                    if(aur2->GetCasterGUID()==Aur->GetCasterGUID())
                    {
+                        // proced Auras may stack, if their Source-Item differ
+                        if (aur2->GetCastItemGUID() != Aur->GetCastItemGUID())
+                            continue;
+
                        // Carry over removed Aura's remaining damage if Aura still has ticks remaining
                        if (!aurSpellInfo->StackAmount && aur2->GetSpellProto()->AttributesEx4 & SPELL_ATTR_EX4_STACK_DOT_MODIFIER &&
                            aurName == SPELL_AURA_PERIODIC_DAMAGE && aur2->GetAuraDuration() > 0)

Notes:

1) Item, that you can be worn twice are: weapons, rings, trinkets. I know of no trinket or ring, that applies a buff, without causing a cooldown to that effect. If you prove me wrong, a more explicit check for the itemSlot or something may be needed.

2) this rule falls short for Enchant Weapon: Executioner, that may not stack. It will require an addition in SpellMgr::IsNoStackSpellDueToSpell() to work propperly

Auntie Mangos · January 1, 1970

Don't know like spell 'all' and los intresting in it fixing. Provide _real_ info about specific problematic spell examples. Noneone need 'any/all/some' references.

heya

this is the major bug

http://getmangos.eu/community/showthread.php?13143-Scrolls-Of-Different-Ranks-Stack-Together

Auntie Mangos · January 1, 1970

heya
this is the major bug

http://getmangos.eu/community/showthread.php?13143-Scrolls-Of-Different-Ranks-Stack-Together

that has nothing todo with weaponenchants..

VladimirMangos · February 3, 2010

As i understand this applied and for master? same problem expected...

[added]Hmm, referenced enchantment spell affects in master not allowed stacked by aura type for spells with not specified stack size amount... (0)

Same for 0.12. You sure that see working this after patch for 0.12...

[added2]Ah, i see now own typo for master version that i attempt prepare...

VladimirMangos · February 3, 2010

I worry about affects from item use, like potions, it also casted as item effects but not expected allow stack effects from 2 scroll.

Sarjuuk · February 4, 2010

your worries were justified.

This does indeed allow Elixirs and Scrolls to stack >_>

sorry

Sarjuuk · February 6, 2010

got finally around to test this.

Weapon cast buffs are stacking, other item-cast Auras are not.

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 6d02ea4..e078127 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -849,8 +849,9 @@ void Aura::_AddAura()
        Unit::spellEffectPair spair = Unit::spellEffectPair(GetId(), i);
        for(Unit::AuraMap::const_iterator itr = m_target->GetAuras().lower_bound(spair); itr != m_target->GetAuras().upper_bound(spair); ++itr)
        {
-            // allow use single slot only by auras from same caster
-            if(itr->second->GetCasterGUID()==GetCasterGUID())
+            // allow use single slot only by auras from same caster (and item)
+            if (itr->second->GetCasterGUID() == GetCasterGUID() &&
+                itr->second->GetCastItemGUID() == GetCastItemGUID())
            {
                samespell = true;
                if (m_effIndex > itr->second->GetEffIndex())
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 076f6e7..fd3d0a5 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -3657,11 +3657,25 @@ bool Unit::AddAura(Aura *Aur)
            // if StackAmount==0 not allow auras from same caster
            else
            {
+                bool isWeaponCastAura = false;
+                if (GetTypeId() == TYPEID_PLAYER)
+                {
+                    if (Item* castItem = ((Player*)this)->GetItemByGuid(Aur->GetCastItemGUID()))
+                    {
+                        if (castItem->GetPos() == ((INVENTORY_SLOT_BAG_0<<8) + EQUIPMENT_SLOT_MAINHAND) ||
+                            castItem->GetPos() == ((INVENTORY_SLOT_BAG_0<<8) + EQUIPMENT_SLOT_OFFHAND))
+                                isWeaponCastAura = true;
+                    }
+                }
                for(AuraMap::iterator i2 = m_Auras.lower_bound(spair); i2 != m_Auras.upper_bound(spair); ++i2)
                {
                    Aura* aur2 = i2->second;
                    if(aur2->GetCasterGUID()==Aur->GetCasterGUID())
                    {
+                        // proced Auras may stack, if their Source-Item differ
+                        if (aur2->GetCastItemGUID() != Aur->GetCastItemGUID() && isWeaponCastAura)
+                            continue;
+
                        // Carry over removed Aura's remaining damage if Aura still has ticks remaining
                        if (!aurSpellInfo->StackAmount && aur2->GetSpellProto()->AttributesEx4 & SPELL_ATTR_EX4_STACK_DOT_MODIFIER &&
                            aurName == SPELL_AURA_PERIODIC_DAMAGE && aur2->GetAuraDuration() > 0)

I'll try to get this for master too.

Sarjuuk · February 20, 2010

ah...

i got a notice, that this patch has an logical error and allows Rogue-Poisons to stack per Weapon

ie. 2x5 Wound-Poison or 2x Mind-Numbing.

sorry again >.<

przemratajczak · February 20, 2010

i would't be so shure if that is not offi behaviour. I red somewhere if stack from one weapon reach 5 than stack for second weapon opens.

EDIT: here it is read spell tooltip. Unfortunatelly only for Deadly Poison :<

http://www.wowhead.com/?item=43233

Sarjuuk · February 21, 2010

no, thats highly unlikely :]

imagine 2x 50% reduced healing .. the QQ would be absurd^^

I think, what the tooltip means is, that, rather adding another application ontop of a full stack, the poison of the other weapon is allowed to proc. But thats just an idea. I read this addition to deadly poison for the first time

Sarjuuk · February 25, 2010

next try:

compiles nicely and on first sight no side effects.

http://paste2.org/p/689424

for mangos-0.12 @ 889abb0ab54824b7aeeebb6af257ab6054d0db65

I do still plan do adapt it for master. Most Excludes wouldn't be needed for 0.12

I still don' know how to handle Executioner in a nice way...

VladimirMangos · February 26, 2010

Ok, more clean look now.

But note:

if (castItem->GetPos() == ((INVENTORY_SLOT_BAG_0<<8) + EQUIPMENT_SLOT_MAINHAND) ||

You can use for example less horriable

item->IsEquipped() && (item->GetSlot() == EQUIPMENT_SLOT_MAINHAND || ...)

I do still plan do adapt it for master.

Nice. Because in most cases in 0.12 not added fixes that appropriate also to master but not fixed yet into master. Because master is primary development target.

Sarjuuk · February 26, 2010

yay, for more visual appeal (:

for master @ 1f4ddbf71ad2ef824b30aa0a639685f2ed61601c :

http://paste2.org/p/691723

for 0.12 @ 66809ac9576d359c416b442c3104819ba287b72a :

http://paste2.org/p/691730

it would be nice, if someone with a player-base, could actually test the master-version a bit more in depths.

/e: got SegFaults .. apparently GetCaster() can be NULL..... diffs updated manually.

Thanks to DasMy, for throwing crashlogs at me.

piroy1337 · February 26, 2010

yay, for more visual appeal (:
for master @ 1f4ddbf71ad2ef824b30aa0a639685f2ed61601c :

http://paste2.org/p/690792

for 0.12 @ 66809ac9576d359c416b442c3104819ba287b72a :

http://paste2.org/p/690799

it would be nice, if someone with a player-base, could actually test the master-version a bit more in depths.

omg fucking awesome, thanks !!<3

yavi · March 1, 2010

AFAIR in master also the 10% exp-buff from heirloom items (chest, weap) didn't stack.

Dunno if it was fixed, because i'm using an self-created ugly hack for it.

VladimirMangos · March 5, 2010

+ if (!ref || !IsPositiveSpell(GetId()))

I think need test aura itself:

if (!IsPositive())

Because spell effects applied to different targets and can be buffs/debufs in same spell.

if (GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER)

Hmm, if we skip debufs then from weapon can be only exist auras at caster itself only? So safe GetTarget link maybe...

VladimirMangos · March 5, 2010

Added to master in [9523]. Thank you

[added]And into 0.12.

Anyone know, is this alsowork in same way for 1.x client time?

Betaman2k · March 17, 2010

Core: 9582

not fixed on core 9582, u can use all Stacking Auras from different castItems. ( full resindet from all boss spells )

VladimirMangos · March 24, 2010

Don't know like spell 'all' and los intresting in it fixing. Provide _real_ info about specific problematic spell examples. Noneone need 'any/all/some' references.

dardennf · March 25, 2010

This is not related (I think).

But yes I can confirm you can currently stack a lot of spell you should not, like this one Power Word : Fortitude and this one Fortitude, in most cases you should not stack 2 buffs which add same exactly stats.

Need more information about what I've said.

Betaman2k · March 25, 2010

u can stack all, u get 300+ protection for Frost,Fire,Nature,Arcane, that is the problem

dardennf · March 25, 2010

Yeah it's a bug, but not related with this commit.

Sign In

[9523] Stacking Auras from different castItems.

Recommended Posts

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Recently Browsing 0 members

Contact Us

Repositories

Important Information