mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-02-15 00:06:11 +00:00
feat(Core/Grids): Remove WorldObject separation in grid containers (#22595)
This commit is contained in:
@@ -673,7 +673,7 @@ public:
|
||||
// Reset The Frozen Throne gameobjects
|
||||
FrozenThroneResetWorker reset;
|
||||
Acore::GameObjectWorker<FrozenThroneResetWorker> worker(me, reset);
|
||||
Cell::VisitGridObjects(me, worker, 333.0f);
|
||||
Cell::VisitObjects(me, worker, 333.0f);
|
||||
|
||||
me->AddAura(SPELL_EMOTE_SIT_NO_SHEATH, me);
|
||||
me->SetImmuneToPC(true);
|
||||
|
||||
@@ -224,7 +224,7 @@ public:
|
||||
bool Execute(uint64 /*currTime*/, uint32 /*diff*/) override
|
||||
{
|
||||
Acore::CreatureWorker<ValithriaDespawner> worker(_creature, *this);
|
||||
Cell::VisitGridObjects(_creature, worker, 333.0f);
|
||||
Cell::VisitObjects(_creature, worker, 333.0f);
|
||||
_creature->AI()->Reset();
|
||||
_creature->setActive(false);
|
||||
return true;
|
||||
@@ -545,7 +545,7 @@ public:
|
||||
std::list<Creature*> archmages;
|
||||
RisenArchmageCheck check;
|
||||
Acore::CreatureListSearcher<RisenArchmageCheck> searcher(me, archmages, check);
|
||||
Cell::VisitGridObjects(me, searcher, 100.0f);
|
||||
Cell::VisitObjects(me, searcher, 100.0f);
|
||||
for (std::list<Creature*>::iterator itr = archmages.begin(); itr != archmages.end(); ++itr)
|
||||
(*itr)->AI()->DoAction(ACTION_ENTER_COMBAT);
|
||||
}
|
||||
|
||||
@@ -856,7 +856,7 @@ public:
|
||||
std::list<Creature*> temp;
|
||||
FrostwingVrykulSearcher check(me, 150.0f);
|
||||
Acore::CreatureListSearcher<FrostwingVrykulSearcher> searcher(me, temp, check);
|
||||
Cell::VisitGridObjects(me, searcher, 150.0f);
|
||||
Cell::VisitObjects(me, searcher, 150.0f);
|
||||
|
||||
_aliveTrash.clear();
|
||||
for (std::list<Creature*>::iterator itr = temp.begin(); itr != temp.end(); ++itr)
|
||||
@@ -901,14 +901,14 @@ public:
|
||||
Player* player = nullptr;
|
||||
Acore::AnyPlayerInObjectRangeCheck check(me, 140.0f);
|
||||
Acore::PlayerSearcher<Acore::AnyPlayerInObjectRangeCheck> searcher(me, player, check);
|
||||
Cell::VisitWorldObjects(me, searcher, 140.0f);
|
||||
Cell::VisitObjects(me, searcher, 140.0f);
|
||||
// wipe
|
||||
if (!player || me->GetExactDist(4357.0f, 2606.0f, 350.0f) > 125.0f)
|
||||
{
|
||||
//Talk(SAY_CROK_DEATH);
|
||||
FrostwingGauntletRespawner respawner;
|
||||
Acore::CreatureWorker<FrostwingGauntletRespawner> worker(me, respawner);
|
||||
Cell::VisitGridObjects(me, worker, 333.0f);
|
||||
Cell::VisitObjects(me, worker, 333.0f);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -1365,7 +1365,7 @@ public:
|
||||
Creature* target = nullptr;
|
||||
Acore::MostHPMissingInRange u_check(me, 60.0f, 0);
|
||||
Acore::CreatureLastSearcher<Acore::MostHPMissingInRange> searcher(me, target, u_check);
|
||||
Cell::VisitGridObjects(me, searcher, 60.0f);
|
||||
Cell::VisitObjects(me, searcher, 60.0f);
|
||||
return target;
|
||||
}
|
||||
};
|
||||
@@ -2261,7 +2261,7 @@ public:
|
||||
{
|
||||
FrostwingGauntletRespawner respawner;
|
||||
Acore::CreatureWorker<FrostwingGauntletRespawner> worker(crok, respawner);
|
||||
Cell::VisitGridObjects(crok, worker, 333.0f);
|
||||
Cell::VisitObjects(crok, worker, 333.0f);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
|
||||
@@ -1665,7 +1665,7 @@ class spell_vehicle_throw_passenger : public SpellScript
|
||||
std::list<WorldObject*> targetList;
|
||||
Acore::WorldObjectSpellAreaTargetCheck check(99, GetExplTargetDest(), GetCaster(), GetCaster(), GetSpellInfo(), TARGET_CHECK_DEFAULT, nullptr);
|
||||
Acore::WorldObjectListSearcher<Acore::WorldObjectSpellAreaTargetCheck> searcher(GetCaster(), targetList, check);
|
||||
Cell::VisitAllObjects(GetCaster(), searcher, 99.0f);
|
||||
Cell::VisitObjects(GetCaster(), searcher, 99.0f);
|
||||
float minDist = 99 * 99;
|
||||
Unit* target = nullptr;
|
||||
for (std::list<WorldObject*>::iterator itr = targetList.begin(); itr != targetList.end(); ++itr)
|
||||
|
||||
@@ -1067,7 +1067,7 @@ public:
|
||||
go->Delete();
|
||||
WretchedGhoulCleaner cleaner;
|
||||
Acore::CreatureWorker<WretchedGhoulCleaner> worker(me, cleaner);
|
||||
Cell::VisitGridObjects(me, worker, 150.0f);
|
||||
Cell::VisitObjects(me, worker, 150.0f);
|
||||
}
|
||||
|
||||
void Reset() override
|
||||
@@ -1281,7 +1281,7 @@ public:
|
||||
{
|
||||
WretchedGhoulCleaner cleaner;
|
||||
Acore::CreatureWorker<WretchedGhoulCleaner> worker(me, cleaner);
|
||||
Cell::VisitGridObjects(me, worker, 150.0f);
|
||||
Cell::VisitObjects(me, worker, 150.0f);
|
||||
|
||||
if (Creature* c = me->FindNearestCreature(NPC_SAC_LIGHTS_VENGEANCE, 150.0f, true))
|
||||
if (Creature* v = me->FindNearestCreature(NPC_SAC_VEGARD_1, 50.0f, true))
|
||||
|
||||
Reference in New Issue
Block a user