mirror of
https://github.com/mangosfour/server.git
synced 2025-12-22 04:37:01 +00:00
Merge branch 'master' into 310
This commit is contained in:
commit
4236f7c75c
21 changed files with 173 additions and 98 deletions
|
|
@ -6453,8 +6453,42 @@ void Aura::PeriodicDummyTick()
|
|||
}
|
||||
case SPELLFAMILY_ROGUE:
|
||||
{
|
||||
// switch (spell->Id)
|
||||
// {
|
||||
switch (spell->Id)
|
||||
{
|
||||
case 51690:
|
||||
{
|
||||
std::list<Unit*> targets;
|
||||
{
|
||||
// eff_radius ==0
|
||||
float radius = GetSpellMaxRange(sSpellRangeStore.LookupEntry(spell->rangeIndex));
|
||||
|
||||
CellPair p(MaNGOS::ComputeCellPair(caster->GetPositionX(),caster->GetPositionY()));
|
||||
Cell cell(p);
|
||||
cell.data.Part.reserved = ALL_DISTRICT;
|
||||
|
||||
MaNGOS::AnyUnfriendlyVisibleUnitInObjectRangeCheck u_check(caster, caster, radius);
|
||||
MaNGOS::UnitListSearcher<MaNGOS::AnyUnfriendlyVisibleUnitInObjectRangeCheck> checker(caster,targets, u_check);
|
||||
|
||||
TypeContainerVisitor<MaNGOS::UnitListSearcher<MaNGOS::AnyUnfriendlyVisibleUnitInObjectRangeCheck>, GridTypeMapContainer > grid_object_checker(checker);
|
||||
TypeContainerVisitor<MaNGOS::UnitListSearcher<MaNGOS::AnyUnfriendlyVisibleUnitInObjectRangeCheck>, WorldTypeMapContainer > world_object_checker(checker);
|
||||
|
||||
CellLock<GridReadGuard> cell_lock(cell, p);
|
||||
|
||||
cell_lock->Visit(cell_lock, grid_object_checker, *caster->GetMap());
|
||||
cell_lock->Visit(cell_lock, world_object_checker, *caster->GetMap());
|
||||
}
|
||||
|
||||
if(targets.empty())
|
||||
return;
|
||||
|
||||
std::list<Unit*>::const_iterator itr = targets.begin();
|
||||
std::advance(itr, rand()%targets.size());
|
||||
Unit* target = *itr;
|
||||
|
||||
caster->CastSpell(target, 57840, true);
|
||||
caster->CastSpell(target, 57841, true);
|
||||
return;
|
||||
}
|
||||
// Master of Subtlety
|
||||
// case 31666: break;
|
||||
// Killing Spree
|
||||
|
|
@ -6463,7 +6497,7 @@ void Aura::PeriodicDummyTick()
|
|||
// case 58428: break;
|
||||
// default:
|
||||
// break;
|
||||
// }
|
||||
}
|
||||
break;
|
||||
}
|
||||
case SPELLFAMILY_HUNTER:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue