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

Core/Refactor: Part 4

Browse Source
This commit is contained in:
hondacrx
2018-05-27 15:40:06 -04:00
parent d94ad385b1
commit 2c3479c6e2
59 changed files with 159 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Spell.cs
+4 -3
View File
@@ -1374,9 +1374,8 @@ namespace Game.Spells
bool searchInWorld = containerMask.HasAnyFlag(GridMapTypeMask.Creature | GridMapTypeMask.Player | GridMapTypeMask.Corpse);
if (searchInGrid || searchInWorld)
{
float x, y;
x = pos.GetPositionX();
y = pos.GetPositionY();
float x = pos.GetPositionX();
float y = pos.GetPositionY();
CellCoord p = GridDefines.ComputeCellCoord(x, y);
Cell cell = new Cell(p);
@@ -1768,6 +1767,8 @@ namespace Game.Spells
if (effect != null && (effectMask & (1 << (int)effect.EffectIndex)) != 0 && CheckEffectTarget(item, effect))
validEffectMask |= 1u << (int)effect.EffectIndex;
effectMask &= validEffectMask;
// no effects left
if (effectMask == 0)
return;
Source/Game/Spells/SpellEffects.cs
-4
View File
@@ -1908,7 +1908,6 @@ namespace Game.Spells
int remaining = dispelList.Count;
// Ok if exist some buffs for dispel try dispel it
uint failCount = 0;
List<DispelableAura> successList = new List<DispelableAura>();
DispelFailed dispelFailed = new DispelFailed();
@@ -1945,7 +1944,6 @@ namespace Game.Spells
}
else
{
++failCount;
dispelFailed.FailedSpells.Add(dispelableAura.GetAura().GetId());
}
++count;
@@ -4747,7 +4745,6 @@ namespace Game.Spells
int remaining = stealList.Count;
// Ok if exist some buffs for dispel try dispel it
uint failCount = 0;
List<Tuple<uint, ObjectGuid>> successList = new List<Tuple<uint, ObjectGuid>>();
DispelFailed dispelFailed = new DispelFailed();
@@ -4772,7 +4769,6 @@ namespace Game.Spells
}
else
{
++failCount;
dispelFailed.FailedSpells.Add(dispelableAura.GetAura().GetId());
}
++count;