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

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2025-05-23 19:55:02 +08:00
parent c6222b9aa3 eced1b714f
commit 4ace49c95a
11 changed files with 112 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+1
View File
@@ -141,6 +141,7 @@ struct npc_kiljaeden_controller : public NullCreatureAI
void Reset() override
{
scheduler.CancelAll();
instance->SetBossState(DATA_KILJAEDEN, NOT_STARTED);
summons.DespawnAll();
ResetOrbs();
src/server/scripts/Outland/zone_blades_edge_mountains.cpp
+2 -2
View File
@@ -122,9 +122,9 @@ public:
if (Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID))
{
if (GetClosestCreatureWithEntry(me, NPC_SOUTH_GATE, 200.0f))
player->KilledMonsterCredit(NPC_SOUTH_GATE_CREDIT);
player->RewardPlayerAndGroupAtEvent(NPC_SOUTH_GATE_CREDIT, player);
else if (GetClosestCreatureWithEntry(me, NPC_NORTH_GATE, 200.0f))
player->KilledMonsterCredit(NPC_NORTH_GATE_CREDIT);
player->RewardPlayerAndGroupAtEvent(NPC_NORTH_GATE_CREDIT, player);
// complete quest part
if (Creature* bunny = GetClosestCreatureWithEntry(me, NPC_EXPLOSION_BUNNY, 200.0f))
bunny->CastSpell(nullptr, SPELL_EXPLOSION, TRIGGERED_NONE);