diff options
Diffstat (limited to 'src/scripts/northrend')
9 files changed, 132 insertions, 123 deletions
diff --git a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp index fa035693008..9cbc514b468 100644 --- a/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/scripts/northrend/azjol_nerub/azjol_nerub/boss_krikthir_the_gatewatcher.cpp @@ -182,18 +182,26 @@ struct boss_krik_thirAI : public ScriptedAI { DoScriptText(SAY_DEATH, me); - if (pInstance) - { - pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, DONE); - //Achievement: Watch him die - Creature *pAdd1, *pAdd2, *pAdd3; - if ((pAdd1 = Unit::GetCreature(*me, pInstance->GetData64(DATA_WATCHER_GASHRA))) && pAdd1->isAlive() && - (pAdd2 = Unit::GetCreature(*me, pInstance->GetData64(DATA_WATCHER_SILTHIK))) && pAdd2->isAlive() && - (pAdd3 = Unit::GetCreature(*me, pInstance->GetData64(DATA_WATCHER_NARJIL))) && pAdd3->isAlive() && - IsHeroic()) - pInstance->DoCompleteAchievement(ACHIEV_WATH_HIM_DIE); - } + if (!pInstance) + return; + + pInstance->SetData(DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, DONE); + //Achievement: Watch him die + Creature *pAdd = Unit::GetCreature(*me, pInstance->GetData64(DATA_WATCHER_GASHRA)); + if (!pAdd || !pAdd->isAlive()) + return; + + pAdd = Unit::GetCreature(*me, pInstance->GetData64(DATA_WATCHER_SILTHIK)); + if (!pAdd || !pAdd->isAlive()) + return; + + pAdd = Unit::GetCreature(*me, pInstance->GetData64(DATA_WATCHER_NARJIL)); + if (!pAdd || !pAdd->isAlive()) + return; + + pInstance->DoCompleteAchievement(ACHIEV_WATH_HIM_DIE); } + void KilledUnit(Unit * victim) { if (victim == me) diff --git a/src/scripts/northrend/borean_tundra.cpp b/src/scripts/northrend/borean_tundra.cpp index b36463b581f..728e065e14a 100644 --- a/src/scripts/northrend/borean_tundra.cpp +++ b/src/scripts/northrend/borean_tundra.cpp @@ -647,6 +647,13 @@ enum eNesingwaryTrapper SPELL_TRAPPED = 46104, }; +#define CaribouTrapsNum 15 +const uint32 CaribouTraps[CaribouTrapsNum] = +{ + GO_CARIBOU_TRAP_1, GO_CARIBOU_TRAP_2, GO_CARIBOU_TRAP_3, GO_CARIBOU_TRAP_4, GO_CARIBOU_TRAP_5, + GO_CARIBOU_TRAP_6, GO_CARIBOU_TRAP_7, GO_CARIBOU_TRAP_8, GO_CARIBOU_TRAP_9, GO_CARIBOU_TRAP_10, + GO_CARIBOU_TRAP_11, GO_CARIBOU_TRAP_12, GO_CARIBOU_TRAP_13, GO_CARIBOU_TRAP_14, GO_CARIBOU_TRAP_15, +}; //#define SAY_NESINGWARY_1 -1571008 struct npc_nesingwary_trapperAI : public ScriptedAI @@ -725,24 +732,15 @@ struct npc_nesingwary_trapperAI : public ScriptedAI case 7: { GameObject *go_caribou = NULL; - if ((go_caribou = me->FindNearestGameObject(GO_CARIBOU_TRAP_1, 5.0f)) || - (go_caribou = me->FindNearestGameObject(GO_CARIBOU_TRAP_2, 5.0f)) || - (go_caribou = me->FindNearestGameObject(GO_CARIBOU_TRAP_3, 5.0f)) || - (go_caribou = me->FindNearestGameObject(GO_CARIBOU_TRAP_4, 5.0f)) || - (go_caribou = me->FindNearestGameObject(GO_CARIBOU_TRAP_5, 5.0f)) || - (go_caribou = me->FindNearestGameObject(GO_CARIBOU_TRAP_6, 5.0f)) || - (go_caribou = me->FindNearestGameObject(GO_CARIBOU_TRAP_7, 5.0f)) || - (go_caribou = me->FindNearestGameObject(GO_CARIBOU_TRAP_8, 5.0f)) || - (go_caribou = me->FindNearestGameObject(GO_CARIBOU_TRAP_9, 5.0f)) || - (go_caribou = me->FindNearestGameObject(GO_CARIBOU_TRAP_10, 5.0f)) || - (go_caribou = me->FindNearestGameObject(GO_CARIBOU_TRAP_11, 5.0f)) || - (go_caribou = me->FindNearestGameObject(GO_CARIBOU_TRAP_12, 5.0f)) || - (go_caribou = me->FindNearestGameObject(GO_CARIBOU_TRAP_13, 5.0f)) || - (go_caribou = me->FindNearestGameObject(GO_CARIBOU_TRAP_14, 5.0f)) || - (go_caribou = me->FindNearestGameObject(GO_CARIBOU_TRAP_15, 5.0f))) + for (uint8 i = 0; i < CaribouTrapsNum; ++i) { - go_caribou->SetGoState(GO_STATE_ACTIVE); - go_caribouGUID = go_caribou->GetGUID(); + go_caribou = me->FindNearestGameObject(CaribouTraps[i], 5.0f); + if (go_caribou) + { + go_caribou->SetGoState(GO_STATE_ACTIVE); + go_caribouGUID = go_caribou->GetGUID(); + break; + } } Phase = 8; uiPhaseTimer = 1000; @@ -2029,6 +2027,16 @@ enum eHelpThemselves GO_MAMMOTH_TRAP_22 = 188044, }; +#define MammothTrapsNum 22 +const uint32 MammothTraps[MammothTrapsNum] = +{ + GO_MAMMOTH_TRAP_1, GO_MAMMOTH_TRAP_2, GO_MAMMOTH_TRAP_3, GO_MAMMOTH_TRAP_4, GO_MAMMOTH_TRAP_5, + GO_MAMMOTH_TRAP_6, GO_MAMMOTH_TRAP_7, GO_MAMMOTH_TRAP_8, GO_MAMMOTH_TRAP_9, GO_MAMMOTH_TRAP_10, + GO_MAMMOTH_TRAP_11, GO_MAMMOTH_TRAP_12, GO_MAMMOTH_TRAP_13, GO_MAMMOTH_TRAP_14, GO_MAMMOTH_TRAP_15, + GO_MAMMOTH_TRAP_16, GO_MAMMOTH_TRAP_17, GO_MAMMOTH_TRAP_18, GO_MAMMOTH_TRAP_19, GO_MAMMOTH_TRAP_20, + GO_MAMMOTH_TRAP_21, GO_MAMMOTH_TRAP_22 +}; + struct npc_trapped_mammoth_calfAI : public ScriptedAI { npc_trapped_mammoth_calfAI(Creature* c) : ScriptedAI(c) {} @@ -2038,34 +2046,19 @@ struct npc_trapped_mammoth_calfAI : public ScriptedAI void Reset() { - GameObject *pTrap; - uiTimer = 1500; bStarted = false; - if ((pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_1,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_2,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_3,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_4,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_5,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_6,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_7,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_8,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_9,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_10,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_11,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_12,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_13,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_14,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_15,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_16,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_17,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_18,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_19,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_20,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_21,1.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_22,1.0f))) - pTrap->SetGoState(GO_STATE_ACTIVE); + GameObject* pTrap; + for (uint8 i = 0; i < MammothTrapsNum; ++i) + { + pTrap = me->FindNearestGameObject(MammothTraps[i],11.0f); + if (pTrap) + { + pTrap->SetGoState(GO_STATE_ACTIVE); + return; + } + } } void UpdateAI(const uint32 diff) @@ -2091,34 +2084,20 @@ struct npc_trapped_mammoth_calfAI : public ScriptedAI void MovementInform(uint32 uiType, uint32 /*uiId*/) { - GameObject* pTrap; + if (uiType != POINT_MOTION_TYPE) return; me->DisappearAndDie(); - - if ((pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_1,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_2,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_3,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_4,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_5,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_6,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_7,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_8,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_9,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_10,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_11,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_12,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_13,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_14,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_15,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_16,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_17,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_18,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_19,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_20,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_21,11.0f)) || - (pTrap = me->FindNearestGameObject(GO_MAMMOTH_TRAP_22,11.0f))) - pTrap->SetLootState(GO_JUST_DEACTIVATED); + GameObject* pTrap; + for (uint8 i = 0; i < MammothTrapsNum; ++i) + { + pTrap = me->FindNearestGameObject(MammothTraps[i],11.0f); + if (pTrap) + { + pTrap->SetLootState(GO_JUST_DEACTIVATED); + return; + } + } } }; @@ -2233,8 +2212,10 @@ struct npc_valiance_keep_cannoneerAI : public ScriptedAI if (uiTimer <= diff) { me->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL); - GameObject* pCannon; - if ((pCannon = me->FindNearestGameObject(GO_VALIANCE_KEEP_CANNON_1,10)) || (pCannon = me->FindNearestGameObject(GO_VALIANCE_KEEP_CANNON_2,10))) + GameObject* pCannon = me->FindNearestGameObject(GO_VALIANCE_KEEP_CANNON_1,10); + if (!pCannon) + pCannon = me->FindNearestGameObject(GO_VALIANCE_KEEP_CANNON_2,10); + if (pCannon) pCannon->Use(me); uiTimer = urand(13000,18000); } diff --git a/src/scripts/northrend/icecrown.cpp b/src/scripts/northrend/icecrown.cpp index 5c47f22f825..84bc655ac22 100644 --- a/src/scripts/northrend/icecrown.cpp +++ b/src/scripts/northrend/icecrown.cpp @@ -301,29 +301,32 @@ struct npc_alorah_and_grimminAI : public ScriptedAI { npc_alorah_and_grimminAI(Creature* pCreature) : ScriptedAI(pCreature) {} - uint8 uiCast; + bool uiCast; void Reset() { - uiCast = 1; + uiCast = false; } void UpdateAI(const uint32 /*uiDiff*/) { - if (uiCast = 1) + if (uiCast) + return; + uiCast = true; + Creature* pTarget = NULL; + + switch(me->GetEntry()) { - Creature* pTarget1 = me->FindNearestCreature(NPC_EYDIS_DARKBANE, 10.0f); - Creature* pTarget2 = me->FindNearestCreature(NPC_FJOLA_LIGHTBANE, 10.0f); - switch(me->GetEntry()) - { - case NPC_PRIESTESS_ALORAH: - DoCast(pTarget1, SPELL_CHAIN); - uiCast = 0; - case NPC_PRIEST_GRIMMIN: - DoCast(pTarget2, SPELL_CHAIN); - uiCast = 0; - } + case NPC_PRIESTESS_ALORAH: + pTarget = me->FindNearestCreature(NPC_EYDIS_DARKBANE, 10.0f); + break; + case NPC_PRIEST_GRIMMIN: + pTarget = me->FindNearestCreature(NPC_FJOLA_LIGHTBANE, 10.0f); + break; } + if (pTarget) + DoCast(pTarget, SPELL_CHAIN); + if (!UpdateVictim()) return; } diff --git a/src/scripts/northrend/naxxramas/instance_naxxramas.cpp b/src/scripts/northrend/naxxramas/instance_naxxramas.cpp index 15b3aecace0..706789a73f1 100644 --- a/src/scripts/northrend/naxxramas/instance_naxxramas.cpp +++ b/src/scripts/northrend/naxxramas/instance_naxxramas.cpp @@ -286,7 +286,7 @@ struct instance_naxxramas : public InstanceData } } - bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* source, Unit const* target = NULL, uint32 miscvalue1 = 0) + bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target = NULL*/, uint32 /*miscvalue1 = 0*/) { switch(criteria_id) { diff --git a/src/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp b/src/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp index 378f2633907..3e24aaeb6c0 100644 --- a/src/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp +++ b/src/scripts/northrend/obsidian_sanctum/boss_sartharion.cpp @@ -1072,7 +1072,7 @@ struct mob_acolyte_of_shadronAI : public ScriptedAI if (pInstance) { Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, 999, true); - Creature* pShadron = NULL; + Creature* pSartharion = Unit::GetCreature(*me, pInstance->GetData64(DATA_SARTHARION)); if (Creature* pShadron = Unit::GetCreature(*me, pInstance->GetData64(DATA_SHADRON))) //if not solo figth, buff main boss, else place debuff on mini-boss. both spells TARGET_SCRIPT diff --git a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp b/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp index b365de8996f..d69f0eee846 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_keep/boss_keleseth.cpp @@ -197,7 +197,8 @@ struct boss_kelesethAI : public ScriptedAI DoScriptText(SAY_SKELETONS, me); for (uint8 i = 0; i < 5; ++i) { - if (Skeleton = me->SummonCreature(CREATURE_SKELETON, SkeletonSpawnPoint[i][0], SkeletonSpawnPoint[i][1] , SKELETONSPAWN_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) + Skeleton = me->SummonCreature(CREATURE_SKELETON, SkeletonSpawnPoint[i][0], SkeletonSpawnPoint[i][1] , SKELETONSPAWN_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); + if (Skeleton) { Skeleton->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); Skeleton->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY() , me->GetPositionZ()); diff --git a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp index 74a94d99dc0..297fe37b7d8 100644 --- a/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp +++ b/src/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_palehoof.cpp @@ -103,17 +103,24 @@ struct boss_palehoofAI : public ScriptedAI { pInstance->SetData(DATA_GORTOK_PALEHOOF_EVENT, NOT_STARTED); - Creature* pTemp; - if ((pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN))) && !pTemp->isAlive()) + Creature* pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_FRENZIED_WORGEN)); + if (pTemp && !pTemp->isAlive()) pTemp->Respawn(); - if ((pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_FEROCIOUS_RHINO))) && !pTemp->isAlive()) + + pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_FEROCIOUS_RHINO)); + if (pTemp && !pTemp->isAlive()) pTemp->Respawn(); - if ((pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR))) && !pTemp->isAlive()) + + pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_MASSIVE_JORMUNGAR)); + if (pTemp && !pTemp->isAlive()) pTemp->Respawn(); - if ((pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_RAVENOUS_FURBOLG))) && !pTemp->isAlive()) + + pTemp = Unit::GetCreature((*me), pInstance->GetData64(DATA_MOB_RAVENOUS_FURBOLG)); + if (pTemp && !pTemp->isAlive()) pTemp->Respawn(); - if (GameObject* pGo = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_GORTOK_PALEHOOF_SPHERE))) + GameObject* pGo = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_GORTOK_PALEHOOF_SPHERE)); + if (pGo) { pGo->SetGoState(GO_STATE_READY); pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); diff --git a/src/scripts/northrend/vault_of_archavon/boss_toravon.cpp b/src/scripts/northrend/vault_of_archavon/boss_toravon.cpp index 250238f1c12..092339be6d5 100644 --- a/src/scripts/northrend/vault_of_archavon/boss_toravon.cpp +++ b/src/scripts/northrend/vault_of_archavon/boss_toravon.cpp @@ -233,21 +233,24 @@ struct mob_frozen_orb_stalkerAI : public Scripted_NoMovementAI void UpdateAI(const uint32 /*diff*/) { - if (!spawned) + if (spawned) + return; + + spawned = true; + if (!pInstance) + return; + + Unit* pToravon = me->GetCreature(*me, pInstance->GetData64(DATA_TORAVON)); + if (!pToravon) + return; + + uint8 num_orbs = RAID_MODE(1, 3); + for (uint8 i=0; i<num_orbs; ++i) { - Unit* pToravon; - if (pInstance && (pToravon = me->GetCreature(*me, pInstance->GetData64(DATA_TORAVON)))) - { - uint8 num_orbs = RAID_MODE(1, 3); - for (uint8 i=0; i<num_orbs; ++i) - { - Position pos; - me->GetNearPoint(pToravon, pos.m_positionX, pos.m_positionY, pos.m_positionZ, 0.0f, 10.0f, 0.0f); - me->SetPosition(pos, true); - DoCast(me, SPELL_FROZEN_ORB_SUMMON); - } - } - spawned = true; + Position pos; + me->GetNearPoint(pToravon, pos.m_positionX, pos.m_positionY, pos.m_positionZ, 0.0f, 10.0f, 0.0f); + me->SetPosition(pos, true); + DoCast(me, SPELL_FROZEN_ORB_SUMMON); } } }; diff --git a/src/scripts/northrend/violet_hold/instance_violet_hold.cpp b/src/scripts/northrend/violet_hold/instance_violet_hold.cpp index 4d993eccd27..d124404610f 100644 --- a/src/scripts/northrend/violet_hold/instance_violet_hold.cpp +++ b/src/scripts/northrend/violet_hold/instance_violet_hold.cpp @@ -274,7 +274,8 @@ struct instance_violet_hold : public ScriptedInstance { case BOSS_MORAGG: HandleGameObject(uiMoraggCell,bForceRespawn); - if (pBoss = instance->GetCreature(uiMoragg)) + pBoss = instance->GetCreature(uiMoragg); + if (pBoss) pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); break; case BOSS_EREKEM: @@ -282,7 +283,8 @@ struct instance_violet_hold : public ScriptedInstance HandleGameObject(uiErekemRightGuardCell, bForceRespawn); HandleGameObject(uiErekemLeftGuardCell, bForceRespawn); - if (pBoss = instance->GetCreature(uiErekem)) + pBoss = instance->GetCreature(uiErekem); + if (pBoss) pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); if (Creature* pGuard1 = instance->GetCreature(uiErekemGuard[0])) @@ -303,22 +305,26 @@ struct instance_violet_hold : public ScriptedInstance break; case BOSS_ICHORON: HandleGameObject(uiIchoronCell,bForceRespawn); - if (pBoss = instance->GetCreature(uiIchoron)) + instance->GetCreature(uiIchoron); + if (pBoss) pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); break; case BOSS_LAVANTHOR: HandleGameObject(uiLavanthorCell,bForceRespawn); - if (pBoss = instance->GetCreature(uiLavanthor)) + pBoss = instance->GetCreature(uiLavanthor); + if (pBoss) pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); break; case BOSS_XEVOZZ: HandleGameObject(uiXevozzCell,bForceRespawn); - if (pBoss = instance->GetCreature(uiXevozz)) + pBoss = instance->GetCreature(uiXevozz); + if (pBoss) pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); break; case BOSS_ZURAMAT: HandleGameObject(uiZuramatCell,bForceRespawn); - if (pBoss = instance->GetCreature(uiZuramat)) + pBoss = instance->GetCreature(uiZuramat); + if (pBoss) pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NON_ATTACKABLE); break; } |