diff options
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Northrend/zone_crystalsong_forest.cpp | 27 | ||||
| -rw-r--r-- | src/server/scripts/Outland/GruulsLair/boss_gruul.cpp | 2 |
2 files changed, 14 insertions, 15 deletions
diff --git a/src/server/scripts/Northrend/zone_crystalsong_forest.cpp b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp index 3b7c5328247..26c494fa54a 100644 --- a/src/server/scripts/Northrend/zone_crystalsong_forest.cpp +++ b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp @@ -68,31 +68,30 @@ public: if (me->IsNonMeleeSpellCast(false)) return; - if (!targetGUID) + if (!targetGUID) + { + if (me->GetEntry() == NPC_WARMAGE_SARINA) { - if (me->GetEntry() == NPC_WARMAGE_SARINA) + std::list<Creature*> orbList; + GetCreatureListWithEntryInGrid(orbList, me, NPC_TRANSITUS_SHIELD_DUMMY, 32.0f); + if (!orbList.empty()) { - std::list<Creature*> orbList; - GetCreatureListWithEntryInGrid(orbList, me, NPC_TRANSITUS_SHIELD_DUMMY, 32.0f); - if (!orbList.empty()) + for (Creature* orb : orbList) { - for (Creature* orb : orbList) + if (orb->GetPositionY() < 1000) { - if (orb->GetPositionY() < 1000) - { - targetGUID = orb->GetGUID(); - break; - } + targetGUID = orb->GetGUID(); + break; } } } - else if (Creature* pOrb = GetClosestCreatureWithEntry(me, NPC_TRANSITUS_SHIELD_DUMMY, 32.0f)) - targetGUID = pOrb->GetGUID(); } + else if (Creature* pOrb = GetClosestCreatureWithEntry(me, NPC_TRANSITUS_SHIELD_DUMMY, 32.0f)) + targetGUID = pOrb->GetGUID(); + } if (Creature* pOrb = ObjectAccessor::GetCreature(*me, targetGUID)) DoCast(pOrb, SPELL_TRANSITUS_SHIELD_BEAM); - } }; diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index ac40dad3ca8..b5061d906c0 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -236,7 +236,7 @@ class boss_gruul : public CreatureScript if (m_uiCaveIn_StaticTimer >= 4000) m_uiCaveIn_StaticTimer -= 2000; - m_uiCaveIn_Timer = m_uiCaveIn_StaticTimer; + m_uiCaveIn_Timer = m_uiCaveIn_StaticTimer; } else m_uiCaveIn_Timer -= diff; |