From 1b4e1fba6afeb4f52ba29d2074b242b4700aaea0 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 12 Apr 2018 10:11:11 -0400 Subject: [PATCH] Core/Phasing: Fixed setting phaseshift flags on condition updates --- Source/Game/Phasing/PhasingHandler.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Game/Phasing/PhasingHandler.cs b/Source/Game/Phasing/PhasingHandler.cs index 3b61a717e..44186c002 100644 --- a/Source/Game/Phasing/PhasingHandler.cs +++ b/Source/Game/Phasing/PhasingHandler.cs @@ -292,6 +292,7 @@ namespace Game if (!phaseRef.AreaConditions.Empty() && !Global.ConditionMgr.IsObjectMeetToConditions(srcInfo, phaseRef.AreaConditions)) { newSuppressions.AddPhase(phaseRef.Id, phaseRef.Flags, phaseRef.AreaConditions, phaseRef.References); + phaseShift.ModifyPhasesReferences(phaseRef, -phaseRef.References); phaseShift.Phases.Remove(phaseRef); } } @@ -301,6 +302,7 @@ namespace Game if (Global.ConditionMgr.IsObjectMeetToConditions(srcInfo, phaseRef.AreaConditions)) { changed = phaseShift.AddPhase(phaseRef.Id, phaseRef.Flags, phaseRef.AreaConditions, phaseRef.References) || changed; + suppressedPhaseShift.ModifyPhasesReferences(phaseRef, -phaseRef.References); suppressedPhaseShift.Phases.Remove(phaseRef); } }