diff --git a/src/IndividualProgressionPlayer.cpp b/src/IndividualProgressionPlayer.cpp index 17fda82..d5c0948 100644 --- a/src/IndividualProgressionPlayer.cpp +++ b/src/IndividualProgressionPlayer.cpp @@ -347,6 +347,7 @@ public: if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR))) { player->RemoveAura(IPP_PHASE); + player->RemoveAura(IPP_PHASE_AQ); player->CastSpell(player, IPP_PHASE, false); } break; @@ -354,6 +355,7 @@ public: if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR))) { player->RemoveAura(IPP_PHASE); + player->RemoveAura(IPP_PHASE_AQ); player->CastSpell(player, IPP_PHASE, false); } break; @@ -361,6 +363,7 @@ public: if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR))) { player->RemoveAura(IPP_PHASE); + player->RemoveAura(IPP_PHASE_AQ); player->CastSpell(player, IPP_PHASE, false); } break; @@ -368,6 +371,7 @@ public: if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR))) { player->RemoveAura(IPP_PHASE); + player->RemoveAura(IPP_PHASE_AQ); player->CastSpell(player, IPP_PHASE, false); } break; @@ -375,10 +379,12 @@ public: if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR))) { player->RemoveAura(IPP_PHASE); + player->RemoveAura(IPP_PHASE_AQ); player->CastSpell(player, IPP_PHASE, false); } else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR)) { + player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE_AQ); player->CastSpell(player, IPP_PHASE_AQ, false); } @@ -387,10 +393,12 @@ public: if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR))) { player->RemoveAura(IPP_PHASE); + player->RemoveAura(IPP_PHASE_AQ); player->CastSpell(player, IPP_PHASE, false); } else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR)) { + player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE_AQ); player->CastSpell(player, IPP_PHASE_AQ, false); } @@ -399,10 +407,12 @@ public: if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR))) { player->RemoveAura(IPP_PHASE); + player->RemoveAura(IPP_PHASE_AQ); player->CastSpell(player, IPP_PHASE, false); } else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR)) { + player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE_AQ); player->CastSpell(player, IPP_PHASE_AQ, false); } @@ -411,10 +421,12 @@ public: if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR))) { player->RemoveAura(IPP_PHASE); + player->RemoveAura(IPP_PHASE_AQ); player->CastSpell(player, IPP_PHASE, false); } else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR)) { + player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE_AQ); player->CastSpell(player, IPP_PHASE_AQ, false); } @@ -423,6 +435,7 @@ public: if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA)) { player->RemoveAura(IPP_PHASE); + player->RemoveAura(IPP_PHASE_AQ); player->CastSpell(player, IPP_PHASE, false); } break; @@ -430,6 +443,7 @@ public: if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA)) { player->RemoveAura(IPP_PHASE); + player->RemoveAura(IPP_PHASE_AQ); player->CastSpell(player, IPP_PHASE, false); } break; @@ -437,6 +451,7 @@ public: if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA)) { player->RemoveAura(IPP_PHASE); + player->RemoveAura(IPP_PHASE_AQ); player->CastSpell(player, IPP_PHASE, false); } break; @@ -444,6 +459,7 @@ public: if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA)) { player->RemoveAura(IPP_PHASE); + player->RemoveAura(IPP_PHASE_AQ); player->CastSpell(player, IPP_PHASE, false); } break; @@ -451,6 +467,7 @@ public: if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA)) { player->RemoveAura(IPP_PHASE); + player->RemoveAura(IPP_PHASE_AQ); player->CastSpell(player, IPP_PHASE, false); } break; @@ -472,6 +489,7 @@ public: break; default: player->RemoveAura(IPP_PHASE); + player->RemoveAura(IPP_PHASE_AQ); } }