Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't save auras casted by items

Browse Source
This commit is contained in:
hondacrx
2017-11-22 12:34:00 -05:00
parent d02d893d15
commit caca2dcb7e
6 changed files with 39 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.DB.cs
+1 -1
View File
@@ -534,7 +534,7 @@ namespace Game.Entities
AuraLoadEffectInfo info = effectInfo[key];
ObjectGuid castId = ObjectGuid.Create(HighGuid.Cast, SpellCastSource.Normal, GetMapId(), spellInfo.Id, GetMap().GenerateLowGuid(HighGuid.Cast));
Aura aura = Aura.TryCreate(spellInfo, castId, key.EffectMask, this, null, info.BaseAmounts, null, casterGuid, castItemLevel);
Aura aura = Aura.TryCreate(spellInfo, castId, key.EffectMask, this, null, info.BaseAmounts, null, casterGuid, itemGuid, castItemLevel);
if (aura != null)
{
if (!aura.CanBeSaved())
Source/Game/Entities/Unit/Unit.Spells.cs
+6 -7
View File
@@ -4161,7 +4161,7 @@ namespace Game.Entities
}
}
}
public Aura _TryStackingOrRefreshingExistingAura(SpellInfo newAura, uint effMask, Unit caster, int[] baseAmount = null, Item castItem = null, ObjectGuid casterGUID = default(ObjectGuid), bool resetPeriodicTimer = true, int castItemLevel = -1)
public Aura _TryStackingOrRefreshingExistingAura(SpellInfo newAura, uint effMask, Unit caster, int[] baseAmount = null, Item castItem = null, ObjectGuid casterGUID = default(ObjectGuid), bool resetPeriodicTimer = true, ObjectGuid castItemGuid = default(ObjectGuid), int castItemLevel = -1)
{
Contract.Assert(!casterGUID.IsEmpty() || caster);
@@ -4173,15 +4173,14 @@ namespace Game.Entities
if (!newAura.IsMultiSlotAura())
{
// check if cast item changed
ObjectGuid castItemGUID = ObjectGuid.Empty;
if (castItem != null)
{
castItemGUID = castItem.GetGUID();
castItemGuid = castItem.GetGUID();
castItemLevel = (int)castItem.GetItemLevel(castItem.GetOwner());
}
// find current aura from spell and change it's stackamount, or refresh it's duration
Aura foundAura = GetOwnedAura(newAura.Id, casterGUID, (newAura.HasAttribute(SpellCustomAttributes.EnchantProc) ? castItemGUID : ObjectGuid.Empty), 0);
Aura foundAura = GetOwnedAura(newAura.Id, casterGUID, (newAura.HasAttribute(SpellCustomAttributes.EnchantProc) ? castItemGuid : ObjectGuid.Empty), 0);
if (foundAura != null)
{
// effect masks do not match
@@ -4211,10 +4210,10 @@ namespace Game.Entities
}
// correct cast item guid if needed
if (castItemGUID != foundAura.GetCastItemGUID())
if (castItemGuid != foundAura.GetCastItemGUID())
{
castItemGUID = foundAura.GetCasterGUID();
castItemLevel = foundAura.GetCastItemLevel();
foundAura.SetCastItemGUID(castItemGuid);
foundAura.SetCastItemLevel(castItemLevel);
}
// try to increase stack amount