nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-02 18:43:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core/Grids): Ported cmangos/mangos-wotlk@ea99457 (#6113)

Browse Source 
* refactor(Core/Grids): Ported cmangos/mangos-wotlk@ea99457

(cherry picked from commit d6201e5dbb)
Co-Authored-By: Shauren <shauren.trinity@gmail.com>
Co-Authored-By: SilverIce <slifeleaf@gmail.com>

* Update CellImpl.h

* w

* more more brackets

* ew

* fix build
This commit is contained in:
Kitzunu
2021-06-03 05:27:51 +02:00
committed by GitHub
parent cc28cf6bf0
commit 7152ddc82c
46 changed files with 238 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
View File

@@ -687,7 +687,7 @@ public:
// Reset The Frozen Throne gameobjects
FrozenThroneResetWorker reset;
Acore::GameObjectWorker<FrozenThroneResetWorker> worker(me, reset);
me->VisitNearbyGridObject(333.0f, worker);
Cell::VisitGridObjects(me, worker, 333.0f);
me->AddAura(SPELL_EMOTE_SIT_NO_SHEATH, me);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);

4
src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
View File

@@ -206,7 +206,7 @@ public:
bool Execute(uint64 /*currTime*/, uint32 /*diff*/) override
{
Acore::CreatureWorker<ValithriaDespawner> worker(_creature, *this);
_creature->VisitNearbyGridObject(333.0f, worker);
Cell::VisitGridObjects(_creature, worker, 333.0f);
_creature->AI()->Reset();
_creature->setActive(false);
return true;
@@ -526,7 +526,7 @@ public:
std::list<Creature*> archmages;
RisenArchmageCheck check;
Acore::CreatureListSearcher<RisenArchmageCheck> searcher(me, archmages, check);
me->VisitNearbyGridObject(100.0f, searcher);
Cell::VisitGridObjects(me, searcher, 100.0f);
for (std::list<Creature*>::iterator itr = archmages.begin(); itr != archmages.end(); ++itr)
(*itr)->AI()->DoAction(ACTION_ENTER_COMBAT);
}

10
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
View File

@@ -841,7 +841,7 @@ public:
std::list<Creature*> temp;
FrostwingVrykulSearcher check(me, 150.0f);
Acore::CreatureListSearcher<FrostwingVrykulSearcher> searcher(me, temp, check);
me->VisitNearbyGridObject(150.0f, searcher);
Cell::VisitGridObjects(me, searcher, 150.0f);
_aliveTrash.clear();
for (std::list<Creature*>::iterator itr = temp.begin(); itr != temp.end(); ++itr)
@@ -886,14 +886,14 @@ public:
Player* player = nullptr;
Acore::AnyPlayerInObjectRangeCheck check(me, 140.0f);
Acore::PlayerSearcher<Acore::AnyPlayerInObjectRangeCheck> searcher(me, player, check);
me->VisitNearbyWorldObject(140.0f, searcher);
Cell::VisitWorldObjects(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);
me->VisitNearbyGridObject(333.0f, worker);
Cell::VisitGridObjects(me, worker, 333.0f);
return;
}
}
@@ -1363,7 +1363,7 @@ public:
Creature* target = nullptr;
Acore::MostHPMissingInRange u_check(me, 60.0f, 0);
Acore::CreatureLastSearcher<Acore::MostHPMissingInRange> searcher(me, target, u_check);
me->VisitNearbyGridObject(60.0f, searcher);
Cell::VisitGridObjects(me, searcher, 60.0f);
return target;
}
};
@@ -2333,7 +2333,7 @@ public:
{
FrostwingGauntletRespawner respawner;
Acore::CreatureWorker<FrostwingGauntletRespawner> worker(crok, respawner);
crok->VisitNearbyGridObject(333.0f, worker);
Cell::VisitGridObjects(crok, worker, 333.0f);
return true;
}
else