diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp index d144423ccca..0467bfce594 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp @@ -387,15 +387,20 @@ void hyjalAI::Reset() //Initialize spells memset(Spell, 0, sizeof(Spell)); - //Reset World States - UpdateWorldState(WORLD_STATE_WAVES, 0); - UpdateWorldState(WORLD_STATE_ENEMY, 0); - UpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0); + //Reset Instance Data for trash count if(pInstance) - pInstance->SetData(DATA_RESET_TRASH_COUNT, 0); - else error_log(ERROR_INST_DATA); + { + if((!pInstance->GetData(DATA_ALLIANCE_RETREAT) && m_creature->GetEntry() == JAINA) || (pInstance->GetData(DATA_ALLIANCE_RETREAT) && m_creature->GetEntry() == THRALL)) + { + //Reset World States + UpdateWorldState(WORLD_STATE_WAVES, 0); + UpdateWorldState(WORLD_STATE_ENEMY, 0); + UpdateWorldState(WORLD_STATE_ENEMYCOUNT, 0); + pInstance->SetData(DATA_RESET_TRASH_COUNT, 0); + } + }else error_log(ERROR_INST_DATA); //Visibility DoHide = true; |