Core/Refactor: Part 3

This commit is contained in:
hondacrx
2018-05-16 19:57:48 -04:00
parent 225a5d27f7
commit 5dacd669b5
112 changed files with 564 additions and 561 deletions
+1 -1
View File
@@ -2411,7 +2411,7 @@ namespace Game.Entities
bool defaultPrevented = false;
absorbAurEff.GetBase().CallScriptEffectManaShieldHandlers(absorbAurEff, aurApp, damageInfo, ref tempAbsorb, defaultPrevented);
absorbAurEff.GetBase().CallScriptEffectManaShieldHandlers(absorbAurEff, aurApp, damageInfo, ref tempAbsorb, ref defaultPrevented);
currentAbsorb = (int)tempAbsorb;
if (defaultPrevented)
+3 -3
View File
@@ -476,11 +476,11 @@ namespace Game.Entities
hitOutCome = _hitOutCome;
}
public uint absorbed_damage { get; set; }
public uint absorbed_damage { get; }
public uint mitigated_damage { get; set; }
public WeaponAttackType attackType { get; set; }
public MeleeHitOutcome hitOutCome { get; set; }
public WeaponAttackType attackType { get; }
public MeleeHitOutcome hitOutCome { get; }
}
public class DispelInfo
+5 -6
View File
@@ -2243,7 +2243,7 @@ namespace Game.Entities
spellHealLog.Crit = critical;
/// @todo: 6.x Has to be implemented
// @todo: 6.x Has to be implemented
/*
var hasCritRollMade = spellHealLog.WriteBit("HasCritRollMade");
var hasCritRollNeeded = spellHealLog.WriteBit("HasCritRollNeeded");
@@ -2494,7 +2494,7 @@ namespace Game.Entities
spellLogEffect.AbsorbedOrAmplitude = info.absorb;
spellLogEffect.Resisted = info.resist;
spellLogEffect.Crit = info.critical;
/// @todo: implement debug info
// @todo: implement debug info
SandboxScalingData sandboxScalingData = new SandboxScalingData();
Unit caster = Global.ObjAccessor.GetUnit(this, aura.GetCasterGUID());
@@ -4181,10 +4181,9 @@ namespace Game.Entities
}
bool remove = false;
var appliedAuraList = GetAppliedAuras();
for (var i = 0; i < appliedAuraList.Count; i++)
for (var i = 0; i < m_appliedAuras.KeyValueList.Count; i++)
{
var app = appliedAuraList[i];
var app = m_appliedAuras.KeyValueList[i];
if (remove)
{
remove = false;
@@ -4195,7 +4194,7 @@ namespace Game.Entities
continue;
RemoveAura(app, AuraRemoveMode.Default);
if (i == appliedAuraList.Count - 1)
if (i == m_appliedAuras.KeyValueList.Count - 1)
break;
remove = true;