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

Misc fixes!

Browse Source
This commit is contained in:
hondacrx
2021-04-12 15:03:12 -04:00
parent 5daa24a805
commit b0e28e1478
3 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/DataStorage/Structs/I_Records.cs
+3 -3
View File
@@ -111,7 +111,7 @@ namespace Game.DataStorage
public sealed class ItemBonusListGroupEntryRecord public sealed class ItemBonusListGroupEntryRecord
{ {
public uint Id; public uint Id;
public int ItemBonusListGroupID; public uint ItemBonusListGroupID;
public int ItemBonusListID; public int ItemBonusListID;
public int ItemLevelSelectorID; public int ItemLevelSelectorID;
public int OrderIndex; public int OrderIndex;
@@ -139,8 +139,8 @@ namespace Game.DataStorage
public ushort ChildItemBonusTreeID; public ushort ChildItemBonusTreeID;
public ushort ChildItemBonusListID; public ushort ChildItemBonusListID;
public ushort ChildItemLevelSelectorID; public ushort ChildItemLevelSelectorID;
public int ItemBonusListGroupID; public uint ItemBonusListGroupID;
public int ParentItemBonusTreeNodeID; public uint ParentItemBonusTreeNodeID;
public uint ParentItemBonusTreeID; public uint ParentItemBonusTreeID;
} }
Source/Game/Entities/Unit/Unit.Combat.cs
+1 -1
View File
@@ -330,7 +330,7 @@ namespace Game.Entities
public virtual void OnCombatExit() public virtual void OnCombatExit()
{ {
foreach (var pair in m_appliedAuras.KeyValueList) foreach (var pair in GetAppliedAuras())
{ {
AuraApplication aurApp = pair.Value; AuraApplication aurApp = pair.Value;
aurApp.GetBase().CallScriptEnterLeaveCombatHandlers(aurApp, false); aurApp.GetBase().CallScriptEnterLeaveCombatHandlers(aurApp, false);
Source/Game/Entities/Unit/Unit.Spells.cs
+1 -13
View File
@@ -4358,24 +4358,12 @@ namespace Game.Entities
return; return;
} }
bool remove = false; foreach (var app in GetAppliedAuras())
for (var i = 0; i < m_appliedAuras.KeyValueList.Count; i++)
{ {
var app = m_appliedAuras.KeyValueList[i];
if (remove)
{
remove = false;
i = 0;
}
if (aura.CanStackWith(app.Value.GetBase())) if (aura.CanStackWith(app.Value.GetBase()))
continue; continue;
RemoveAura(app, AuraRemoveMode.Default); RemoveAura(app, AuraRemoveMode.Default);
if (i == m_appliedAuras.KeyValueList.Count - 1)
break;
remove = true;
} }
} }
public int GetHighestExclusiveSameEffectSpellGroupValue(AuraEffect aurEff, AuraType auraType, bool checkMiscValue = false, int miscValue = 0) public int GetHighestExclusiveSameEffectSpellGroupValue(AuraEffect aurEff, AuraType auraType, bool checkMiscValue = false, int miscValue = 0)