Skip to content

Commit a5f57c2

Browse files
committed
tweaks, god that was an annoying way to access group members
1 parent b03c48f commit a5f57c2

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ struct boss_drakkari_colossus : public BossAI
9393
{
9494
_Reset();
9595

96-
instance->instance->SpawnGroupSpawn(SPAWN_GROUP_MOJO, true, true);
96+
instance->instance->SpawnGroupSpawn(SPAWN_GROUP_MOJO, true);
9797
me->SetReactState(REACT_PASSIVE);
9898
}
9999

@@ -118,6 +118,8 @@ struct boss_drakkari_colossus : public BossAI
118118
events.RescheduleEvent(EVENT_MIGHTY_BLOW, 10s, 30s);
119119
if (Unit* victim = me->SelectVictim())
120120
AttackStart(victim);
121+
else
122+
DoZoneInCombat();
121123
break;
122124
}
123125
}
@@ -351,7 +353,10 @@ struct npc_living_mojo : public ScriptedAI
351353
{
352354
if (Creature* colossus = _instance->GetCreature(DATA_DRAKKARI_COLOSSUS))
353355
{
354-
me->GetMotionMaster()->MovePoint(POINT_COLOSSUS, colossus->GetHomePosition());
356+
for (auto& pair : sObjectMgr->GetSpawnMetadataForGroup(SPAWN_GROUP_MOJO))
357+
if (Creature* mojo = _instance->instance->GetCreatureBySpawnId(pair.second->spawnId))
358+
if (mojo->GetMotionMaster()->GetCurrentMovementGeneratorType()) == MovementGeneratorType::IDLE_MOTION_TYPE)
359+
mojo->GetMotionMaster()->MovePoint(POINT_COLOSSUS, colossus->GetHomePosition());
355360
return;
356361
}
357362
else

0 commit comments

Comments
 (0)