mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-01-17 10:55:43 +00:00
feat(Core/Grids): Remove WorldObject separation in grid containers (#22595)
This commit is contained in:
@@ -1358,11 +1358,7 @@ class spell_gen_cannibalize : public SpellScript
|
||||
// search for nearby enemy corpse in range
|
||||
Acore::AnyDeadUnitSpellTargetInRangeCheck check(caster, max_range, GetSpellInfo(), TARGET_CHECK_CORPSE);
|
||||
Acore::WorldObjectSearcher<Acore::AnyDeadUnitSpellTargetInRangeCheck> searcher(caster, result, check);
|
||||
Cell::VisitWorldObjects(caster, searcher, max_range);
|
||||
if (!result)
|
||||
{
|
||||
Cell::VisitGridObjects(caster, searcher, max_range);
|
||||
}
|
||||
Cell::VisitObjects(caster, searcher, max_range);
|
||||
if (!result)
|
||||
{
|
||||
return SPELL_FAILED_NO_EDIBLE_CORPSES;
|
||||
|
||||
@@ -843,11 +843,7 @@ class spell_hun_pet_carrion_feeder : public SpellScript
|
||||
// search for nearby enemy corpse in range
|
||||
Acore::AnyDeadUnitSpellTargetInRangeCheck check(caster, max_range, GetSpellInfo(), TARGET_CHECK_ENEMY);
|
||||
Acore::WorldObjectSearcher<Acore::AnyDeadUnitSpellTargetInRangeCheck> searcher(caster, result, check);
|
||||
Cell::VisitWorldObjects(caster, searcher, max_range);
|
||||
if (!result)
|
||||
{
|
||||
Cell::VisitGridObjects(caster, searcher, max_range);
|
||||
}
|
||||
Cell::VisitObjects(caster, searcher, max_range);
|
||||
if (!result)
|
||||
{
|
||||
return SPELL_FAILED_NO_EDIBLE_CORPSES;
|
||||
|
||||
@@ -1876,7 +1876,7 @@ class spell_q11010_q11102_q11023_choose_loc : public SpellScript
|
||||
std::list<Player*> playerList;
|
||||
Acore::AnyPlayerInObjectRangeCheck checker(caster, 65.0f);
|
||||
Acore::PlayerListSearcher<Acore::AnyPlayerInObjectRangeCheck> searcher(caster, playerList, checker);
|
||||
Cell::VisitWorldObjects(caster, searcher, 65.0f);
|
||||
Cell::VisitObjects(caster, searcher, 65.0f);
|
||||
for (std::list<Player*>::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr)
|
||||
// Check if found player target is on fly mount or using flying form
|
||||
if ((*itr)->HasFlyAura() || (*itr)->HasIncreaseMountedFlightSpeedAura())
|
||||
|
||||
Reference in New Issue
Block a user