sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Scripts/VH): Add missing second type for keeper NPC (#22171) (#23789)

Browse Source
This commit is contained in:
Traesh
2025-11-20 00:50:02 +01:00
committed by GitHub
parent 3c4a68c2e2
commit 374eb1b6c9
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+3 -2
View File
@@ -182,7 +182,7 @@ public:
case EVENT_SUMMON_KEEPER_OR_GUARDIAN: case EVENT_SUMMON_KEEPER_OR_GUARDIAN:
bKorG = true; bKorG = true;
spawned = 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); me->CastSpell(c, SPELL_PORTAL_CHANNEL, false);
events.RescheduleEvent(EVENT_SUMMON_KEEPER_TRASH, 20s); events.RescheduleEvent(EVENT_SUMMON_KEEPER_TRASH, 20s);
break; break;
@@ -220,11 +220,12 @@ public:
if (pInstance) if (pInstance)
for (SummonList::iterator itr = listOfMobs.begin(); itr != listOfMobs.end(); ++itr) for (SummonList::iterator itr = listOfMobs.begin(); itr != listOfMobs.end(); ++itr)
if (Creature* c = pInstance->instance->GetCreature(*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); me->CastSpell(c, SPELL_PORTAL_CHANNEL, false);
return; return;
} }
Unit::Kill(me, me, false); Unit::Kill(me, me, false);
} }
} }
src/server/scripts/Northrend/VioletHold/violet_hold.h
+2 -1
View File
@@ -47,7 +47,8 @@ enum Creatures
NPC_CYANIGOSA = 31134, NPC_CYANIGOSA = 31134,
NPC_PORTAL_GUARDIAN = 30660, 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_1 = 30661,
NPC_AZURE_INVADER_2 = 30961, NPC_AZURE_INVADER_2 = 30961,
NPC_AZURE_SPELLBREAKER_1 = 30662, NPC_AZURE_SPELLBREAKER_1 = 30662,