Core/Refactor: Part 1
This commit is contained in:
@@ -249,11 +249,15 @@ namespace Game
|
||||
|
||||
public override bool Equals(object obj)
|
||||
{
|
||||
return base.Equals(obj);
|
||||
if (obj is PhaseRef)
|
||||
return (PhaseRef)obj == this;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public override int GetHashCode()
|
||||
{
|
||||
return base.GetHashCode();
|
||||
return Id.GetHashCode() ^ Flags.GetHashCode() ^ References.GetHashCode() ^ AreaConditions.GetHashCode();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -337,7 +337,6 @@ namespace Game
|
||||
foreach (AuraEffect aurEff in unit.GetAuraEffectsByType(AuraType.Phase))
|
||||
{
|
||||
uint phaseId = (uint)aurEff.GetMiscValueB();
|
||||
var eraseResult = newSuppressions.RemovePhase(phaseId);
|
||||
// if condition was met previously there is nothing to erase
|
||||
if (newSuppressions.RemovePhase(phaseId))
|
||||
phaseShift.AddPhase(phaseId, GetPhaseFlags(phaseId), null);//todo needs checked
|
||||
|
||||
Reference in New Issue
Block a user