diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Northrend/VioletHold/violet_hold.cpp | 5 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/VioletHold/violet_hold.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 29398075ad..4d1bc0924f 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -182,7 +182,7 @@ public: case EVENT_SUMMON_KEEPER_OR_GUARDIAN: bKorG = true; spawned = true; - if (Creature* c = DoSummon(RAND(NPC_PORTAL_GUARDIAN, NPC_PORTAL_KEEPER), me, 2.0f, 0, TEMPSUMMON_DEAD_DESPAWN)) + if (Creature* c = DoSummon(RAND(NPC_PORTAL_GUARDIAN, NPC_PORTAL_KEEPER_1, NPC_PORTAL_KEEPER_2), me, 2.0f, 0, TEMPSUMMON_DEAD_DESPAWN)) me->CastSpell(c, SPELL_PORTAL_CHANNEL, false); events.RescheduleEvent(EVENT_SUMMON_KEEPER_TRASH, 20s); break; @@ -220,11 +220,12 @@ public: if (pInstance) for (SummonList::iterator itr = listOfMobs.begin(); itr != listOfMobs.end(); ++itr) if (Creature* c = pInstance->instance->GetCreature(*itr)) - if (c->IsAlive() && (c->GetEntry() == NPC_PORTAL_GUARDIAN || c->GetEntry() == NPC_PORTAL_KEEPER)) + if (c->IsAlive() && c->EntryEquals(NPC_PORTAL_GUARDIAN, NPC_PORTAL_KEEPER_1, NPC_PORTAL_KEEPER_2)) { me->CastSpell(c, SPELL_PORTAL_CHANNEL, false); return; } + Unit::Kill(me, me, false); } } diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.h b/src/server/scripts/Northrend/VioletHold/violet_hold.h index 229319087a..a21142afd7 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.h +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.h @@ -47,7 +47,8 @@ enum Creatures NPC_CYANIGOSA = 31134, NPC_PORTAL_GUARDIAN = 30660, - NPC_PORTAL_KEEPER = 30695, + NPC_PORTAL_KEEPER_1 = 30695, + NPC_PORTAL_KEEPER_2 = 30893, NPC_AZURE_INVADER_1 = 30661, NPC_AZURE_INVADER_2 = 30961, NPC_AZURE_SPELLBREAKER_1 = 30662, |