Core/Entities: Phasing rewrite

2018-03-28 11:09:30 -04:00
parent caad52f636
commit fa35d60f60
72 changed files with 2254 additions and 1146 deletions
@@ -271,7 +271,7 @@ namespace Game.Conditions
                    condMeets = (ConditionValue2 == Global.WorldMgr.getWorldState((WorldStates)ConditionValue1));
                    break;
                case ConditionTypes.PhaseId:
-                    condMeets = obj.IsInPhase(ConditionValue1);
+                    condMeets = obj.GetPhaseShift().HasPhase(ConditionValue1);
                    break;
                case ConditionTypes.Title:
                    if (player != null)
@@ -303,7 +303,7 @@ namespace Game.Conditions
                        condMeets = unit.IsInWater();
                    break;
                case ConditionTypes.TerrainSwap:
-                    condMeets = obj.IsInTerrainSwap(ConditionValue1);
+                    condMeets = obj.GetPhaseShift().HasVisibleMapId(ConditionValue1);
                    break;
                case ConditionTypes.StandState:
                    {